src/hotspot/share/jvmci/jvmciRuntime.cpp

*** 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
  
--- 48,60 ----
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/threadSMR.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/macros.hpp"
! #if INCLUDE_G1GC
  #include "gc/g1/g1ThreadLocalData.hpp"
! #endif // INCLUDE_G1GC
  
  #if defined(_MSC_VER)
  #define strtoll _strtoi64
  #endif
  
*** 482,503 ****
    if (newline) {
      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)) {
      tty->print_cr("Parent Object " INTPTR_FORMAT " not in heap", p2i(parent));
      parent->print();
--- 482,503 ----
    if (newline) {
      tty->cr();
    }
  JRT_END
  
+ #if INCLUDE_G1GC
+ 
  JRT_LEAF(void, JVMCIRuntime::write_barrier_pre(JavaThread* thread, oopDesc* obj))
    G1ThreadLocalData::satb_mark_queue(thread).enqueue(obj);
  JRT_END
  
  JRT_LEAF(void, JVMCIRuntime::write_barrier_post(JavaThread* thread, void* card_addr))
    G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr);
  JRT_END
  
+ #endif // INCLUDE_G1GC
+ 
  JRT_LEAF(jboolean, JVMCIRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child))
    bool ret = true;
    if(!Universe::heap()->is_in_closed_subset(parent)) {
      tty->print_cr("Parent Object " INTPTR_FORMAT " not in heap", p2i(parent));
      parent->print();