src/hotspot/share/c1/c1_LIRGenerator.cpp

*** 42,51 ****
--- 42,52 ----
  #include "runtime/stubRoutines.hpp"
  #include "runtime/vm_version.hpp"
  #include "utilities/bitMap.inline.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef TRACE_HAVE_INTRINSICS
  #include "trace/traceMacros.hpp"
  #endif
*** 1504,1517 ****
      // need to use unsigned instructions to use the large offset to load the satb_mark_queue.
      flag_type = T_BOOLEAN;
    }
    LIR_Opr thrd = getThreadPointer();
    LIR_Address* mark_active_flag_addr =
!     new LIR_Address(thrd,
!                     in_bytes(JavaThread::satb_mark_queue_offset() +
!                              SATBMarkQueue::byte_offset_of_active()),
!                     flag_type);
    // Read the marking-in-progress flag.
    LIR_Opr flag_val = new_register(T_INT);
    __ load(mark_active_flag_addr, flag_val);
    __ cmp(lir_cond_notEqual, flag_val, LIR_OprFact::intConst(0));
  
--- 1505,1515 ----
      // need to use unsigned instructions to use the large offset to load the satb_mark_queue.
      flag_type = T_BOOLEAN;
    }
    LIR_Opr thrd = getThreadPointer();
    LIR_Address* mark_active_flag_addr =
!     new LIR_Address(thrd, in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()), flag_type);
    // Read the marking-in-progress flag.
    LIR_Opr flag_val = new_register(T_INT);
    __ load(mark_active_flag_addr, flag_val);
    __ cmp(lir_cond_notEqual, flag_val, LIR_OprFact::intConst(0));