src/hotspot/share/runtime/jniHandles.cpp

G1BarrierSet_merge

*** 32,42 ****
  #include "runtime/thread.inline.hpp"
  #include "trace/traceMacros.hpp"
  #include "utilities/align.hpp"
  #include "utilities/debug.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif
  
  OopStorage* JNIHandles::_global_handles = NULL;
  OopStorage* JNIHandles::_weak_global_handles = NULL;
  
--- 32,42 ----
  #include "runtime/thread.inline.hpp"
  #include "trace/traceMacros.hpp"
  #include "utilities/align.hpp"
  #include "utilities/debug.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1BarrierSet.hpp"
  #endif
  
  OopStorage* JNIHandles::_global_handles = NULL;
  OopStorage* JNIHandles::_weak_global_handles = NULL;
  
***************
*** 139,149 ****
    assert(handle != NULL, "precondition");
    assert(is_jweak(handle), "precondition");
    oop result = jweak_ref(handle);
  #if INCLUDE_ALL_GCS
    if (result != NULL && UseG1GC) {
!     G1SATBCardTableModRefBS::enqueue(result);
    }
  #endif // INCLUDE_ALL_GCS
    return result;
  }
  
--- 139,149 ----
    assert(handle != NULL, "precondition");
    assert(is_jweak(handle), "precondition");
    oop result = jweak_ref(handle);
  #if INCLUDE_ALL_GCS
    if (result != NULL && UseG1GC) {
!     G1BarrierSet::enqueue(result);
    }
  #endif // INCLUDE_ALL_GCS
    return result;
  }