mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop leaking memory.

Browse Source
This commit is contained in:
Camille GILLOT 2020-04-01 14:29:55 +02:00
parent e56c400432
commit 143b8816a3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustc_query_system/query/caches.rs
View File

@ -143,16 +143,13 @@ impl<'tcx, K: Eq + Hash, V: 'tcx> CacheSelector<K, V> for ArenaCacheSelector<'tc
} }
pub struct ArenaCache<'tcx, K, V> { pub struct ArenaCache<'tcx, K, V> {
arena: WorkerLocal<&'tcx TypedArena<(V, DepNodeIndex)>>, arena: WorkerLocal<TypedArena<(V, DepNodeIndex)>>,
phantom: PhantomData<K>, phantom: PhantomData<(K, &'tcx V)>,
} }
impl<'tcx, K, V> Default for ArenaCache<'tcx, K, V> { impl<'tcx, K, V> Default for ArenaCache<'tcx, K, V> {
fn default() -> Self { fn default() -> Self {
ArenaCache { ArenaCache { arena: WorkerLocal::new(|_| TypedArena::default()), phantom: PhantomData }
arena: WorkerLocal::new(|_| &*Box::leak(Box::new(TypedArena::default()))),
phantom: PhantomData,
}
} }
} }
@ -162,7 +159,8 @@ impl<'tcx, K: Eq + Hash, V: 'tcx> QueryStorage for ArenaCache<'tcx, K, V> {
fn store_nocache(&self, value: Self::Value) -> Self::Stored { fn store_nocache(&self, value: Self::Value) -> Self::Stored {
let value = self.arena.alloc((value, DepNodeIndex::INVALID)); let value = self.arena.alloc((value, DepNodeIndex::INVALID));
&value.0 let value = unsafe { &*(&value.0 as *const _) };
&value
} }
} }
@ -204,6 +202,7 @@ impl<'tcx, K: Eq + Hash, V: 'tcx> QueryCache for ArenaCache<'tcx, K, V> {
index: DepNodeIndex, index: DepNodeIndex,
) -> Self::Stored { ) -> Self::Stored {
let value = self.arena.alloc((value, index)); let value = self.arena.alloc((value, index));
let value = unsafe { &*(value as *const _) };
lock_sharded_storage.insert(key, value); lock_sharded_storage.insert(key, value);
&value.0 &value.0
} }