src/hotspot/share/runtime/sharedRuntime.cpp

*** 73,82 ****
--- 73,85 ----
  #include "utilities/macros.hpp"
  #include "utilities/xmlstream.hpp"
  #ifdef COMPILER1
  #include "c1/c1_Runtime1.hpp"
  #endif
+ #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1ThreadLocalData.hpp"
+ #endif // INCLUDE_ALL_GCS
  
  // Shared stub locations
  RuntimeStub*        SharedRuntime::_wrong_method_blob;
  RuntimeStub*        SharedRuntime::_wrong_method_abstract_blob;
  RuntimeStub*        SharedRuntime::_ic_miss_blob;
*** 212,227 ****
      assert(false, "should be optimized out");
      return;
    }
    assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error");
    // store the original value that was in the field reference
!   thread->satb_mark_queue().enqueue(orig);
  JRT_END
  
  // G1 write-barrier post: executed after a pointer store.
  JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread))
!   thread->dirty_card_queue().enqueue(card_addr);
  JRT_END
  
  #endif // INCLUDE_ALL_GCS
  
  
--- 215,230 ----
      assert(false, "should be optimized out");
      return;
    }
    assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error");
    // store the original value that was in the field reference
!   G1ThreadLocalData::satb_mark_queue(thread).enqueue(orig);
  JRT_END
  
  // G1 write-barrier post: executed after a pointer store.
  JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread))
!   G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr);
  JRT_END
  
  #endif // INCLUDE_ALL_GCS