Skip to content

Commit

Permalink
8266440: Shenandoah: TestReferenceShortcutCycle.java test failed on A…
Browse files Browse the repository at this point in the history
…Arch64

Reviewed-by: aph
  • Loading branch information
zhengyu123 committed May 10, 2021
1 parent de78431 commit f78440a
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,14 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
__ ldrb(rscratch2, gc_state);

// Check for heap stability
__ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, heap_stable);
if (is_strong) {
__ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, heap_stable);
} else {
Label lrb;
__ tbnz(rscratch2, ShenandoahHeap::WEAK_ROOTS_BITPOS, lrb);
__ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, heap_stable);
__ bind(lrb);
}

// use r1 for load address
Register result_dst = dst;
Expand Down

1 comment on commit f78440a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.