src/cpu/x86/vm/macroAssembler_x86.cpp

rev 11463 : Backport Traversal GC

*** 4193,4203 ****
    Address buffer(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
                                         PtrQueue::byte_offset_of_buf()));
  
    if (UseShenandoahGC) {
      Address gc_state(thread, in_bytes(JavaThread::gc_state_offset()));
!     testb(gc_state, ShenandoahHeap::MARKING);
      jcc(Assembler::zero, done);
    } else {
      assert(UseG1GC, "Should be");
      // Is marking active?
      if (in_bytes(PtrQueue::byte_width_of_active()) == 4) {
--- 4193,4203 ----
    Address buffer(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
                                         PtrQueue::byte_offset_of_buf()));
  
    if (UseShenandoahGC) {
      Address gc_state(thread, in_bytes(JavaThread::gc_state_offset()));
!     testb(gc_state, ShenandoahHeap::MARKING | ShenandoahHeap::TRAVERSAL);
      jcc(Assembler::zero, done);
    } else {
      assert(UseG1GC, "Should be");
      // Is marking active?
      if (in_bytes(PtrQueue::byte_width_of_active()) == 4) {