Skip to content

Commit 0763fb7

Browse files
committed
Immix needs post_scan. Fix style check
1 parent 98e9ed5 commit 0763fb7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/plan/global.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,11 @@ pub struct CommonPlan<VM: VMBinding> {
564564
pub immortal: ImmortalSpace<VM>,
565565
#[space]
566566
pub los: LargeObjectSpace<VM>,
567-
// TODO: We should use a marksweep space for nonmoving.
568567
#[space]
568+
#[cfg_attr(
569+
not(any(feature = "immortal_as_nonmoving", feature = "marksweep_as_nonmoving")),
570+
post_scan
571+
)] // Immix space needs post_scan
569572
pub nonmoving: NonMovingSpace<VM>,
570573
#[parent]
571574
pub base: BasePlan<VM>,

src/policy/immix/immixspace.rs

+1
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ impl<VM: VMBinding> crate::policy::gc_work::PolicyTraceObject<VM> for ImmixSpace
232232
}
233233
}
234234

235+
#[allow(clippy::if_same_then_else)] // DEFAULT_TRACE needs a workaround which is documented below.
235236
fn may_move_objects<const KIND: TraceKind>() -> bool {
236237
if KIND == TRACE_KIND_DEFRAG {
237238
true

0 commit comments

Comments
 (0)