src/hotspot/share/jvmci/jvmciRuntime.cpp

*** 48,57 ****
--- 48,60 ----
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/threadSMR.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/macros.hpp"
+ #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1ThreadLocalData.hpp"
+ #endif // INCLUDE_ALL_GCS
  
  #if defined(_MSC_VER)
  #define strtoll _strtoi64
  #endif
  
*** 452,466 ****
      tty->cr();
    }
  JRT_END
  
  JRT_LEAF(void, JVMCIRuntime::write_barrier_pre(JavaThread* thread, oopDesc* obj))
!   thread->satb_mark_queue().enqueue(obj);
  JRT_END
  
  JRT_LEAF(void, JVMCIRuntime::write_barrier_post(JavaThread* thread, void* card_addr))
!   thread->dirty_card_queue().enqueue(card_addr);
  JRT_END
  
  JRT_LEAF(jboolean, JVMCIRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child))
    bool ret = true;
    if(!Universe::heap()->is_in_closed_subset(parent)) {
--- 455,473 ----
      tty->cr();
    }
  JRT_END
  
  JRT_LEAF(void, JVMCIRuntime::write_barrier_pre(JavaThread* thread, oopDesc* obj))
! #if INCLUDE_ALL_GCS
!   G1ThreadLocalData::satb_mark_queue(thread).enqueue(obj);
! #endif // INCLUDE_ALL_GCS
  JRT_END
  
  JRT_LEAF(void, JVMCIRuntime::write_barrier_post(JavaThread* thread, void* card_addr))
! #if INCLUDE_ALL_GCS
!   G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr);
! #endif // INCLUDE_ALL_GCS
  JRT_END
  
  JRT_LEAF(jboolean, JVMCIRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child))
    bool ret = true;
    if(!Universe::heap()->is_in_closed_subset(parent)) {