Skip to content

Commit

Permalink
8254319: Shenandoah: Interpreter native-LRB needs to activate during …
Browse files Browse the repository at this point in the history
…HAS_FORWARDED

Reviewed-by: shade, zgu
  • Loading branch information
rkennke committed Oct 9, 2020
1 parent be26972 commit 536b35b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler
__ ldrb(rscratch2, gc_state);

// Check for heap in evacuation phase
__ tbz(rscratch2, ShenandoahHeap::EVACUATION_BITPOS, done);
__ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, done);

__ mov(rscratch2, dst);
__ push_call_clobbered_registers();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler
assert_different_registers(dst, thread);

Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
__ testb(gc_state, ShenandoahHeap::EVACUATION);
__ testb(gc_state, ShenandoahHeap::HAS_FORWARDED);
#ifndef _LP64
__ pop(thread);
#endif
Expand Down

1 comment on commit 536b35b

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented on 536b35b Oct 9, 2020

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.