Skip to content

Commit b92abac

Browse files
committedMar 11, 2021
8263433: Shenandoah: Don't expect forwarded objects in set_concurrent_mark_in_progress()
Reviewed-by: shade
1 parent 15dacca commit b92abac

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed
 

‎src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -1696,11 +1696,8 @@ void ShenandoahHeap::set_gc_state_mask(uint mask, bool value) {
16961696
}
16971697

16981698
void ShenandoahHeap::set_concurrent_mark_in_progress(bool in_progress) {
1699-
if (has_forwarded_objects()) {
1700-
set_gc_state_mask(MARKING | UPDATEREFS, in_progress);
1701-
} else {
1702-
set_gc_state_mask(MARKING, in_progress);
1703-
}
1699+
assert(!has_forwarded_objects(), "Not expected before/after mark phase");
1700+
set_gc_state_mask(MARKING, in_progress);
17041701
ShenandoahBarrierSet::satb_mark_queue_set().set_active_all_threads(in_progress, !in_progress);
17051702
}
17061703

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Mar 11, 2021

@openjdk-notifier[bot]
Please sign in to comment.