Skip to content

Commit abbde8b

Browse files
committed
Remove ALLOC_TABLE from local specs. Fix build for 1.74.1
1 parent 1c64dcb commit abbde8b

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

src/policy/immix/immixspace.rs

-2
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ impl<VM: VMBinding> ImmixSpace<VM> {
252252
vec![
253253
MetadataSpec::OnSide(Block::DEFRAG_STATE_TABLE),
254254
MetadataSpec::OnSide(Block::MARK_TABLE),
255-
MetadataSpec::OnSide(ChunkMap::ALLOC_TABLE),
256255
*VM::VMObjectModel::LOCAL_MARK_BIT_SPEC,
257256
*VM::VMObjectModel::LOCAL_FORWARDING_BITS_SPEC,
258257
*VM::VMObjectModel::LOCAL_FORWARDING_POINTER_SPEC,
@@ -264,7 +263,6 @@ impl<VM: VMBinding> ImmixSpace<VM> {
264263
MetadataSpec::OnSide(Line::MARK_TABLE),
265264
MetadataSpec::OnSide(Block::DEFRAG_STATE_TABLE),
266265
MetadataSpec::OnSide(Block::MARK_TABLE),
267-
MetadataSpec::OnSide(ChunkMap::ALLOC_TABLE),
268266
*VM::VMObjectModel::LOCAL_MARK_BIT_SPEC,
269267
*VM::VMObjectModel::LOCAL_FORWARDING_BITS_SPEC,
270268
*VM::VMObjectModel::LOCAL_FORWARDING_POINTER_SPEC,

src/policy/marksweepspace/native_ms/global.rs

-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ impl<VM: VMBinding> MarkSweepSpace<VM> {
300300
MetadataSpec::OnSide(Block::BLOCK_LIST_TABLE),
301301
MetadataSpec::OnSide(Block::TLS_TABLE),
302302
MetadataSpec::OnSide(Block::MARK_TABLE),
303-
MetadataSpec::OnSide(ChunkMap::ALLOC_TABLE),
304303
*VM::VMObjectModel::LOCAL_MARK_BIT_SPEC,
305304
])
306305
};

src/util/heap/chunk_map.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,14 @@ impl ChunkMap {
173173
}
174174

175175
/// A range of all chunks in the heap.
176-
pub fn all_chunks(&self) -> impl Iterator<Item = Chunk> + use<'_> {
176+
pub fn all_chunks(&self) -> impl Iterator<Item = Chunk> + '_ {
177177
let chunk_range = self.chunk_range.lock();
178178
RegionIterator::<Chunk>::new(chunk_range.start, chunk_range.end)
179179
.filter(|c| self.get(*c).is_some())
180180
}
181181

182182
/// A range of all chunks in the heap.
183-
pub fn all_allocated_chunks(&self) -> impl Iterator<Item = Chunk> + use<'_> {
183+
pub fn all_allocated_chunks(&self) -> impl Iterator<Item = Chunk> + '_ {
184184
let chunk_range = self.chunk_range.lock();
185185
RegionIterator::<Chunk>::new(chunk_range.start, chunk_range.end)
186186
.filter(|c| self.get(*c).is_some_and(|state| state.is_allocated()))

0 commit comments

Comments
 (0)