src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp

G1BarrierSet_merge

*** 28,38 ****
  #include "memory/universe.inline.hpp"
  #include "prims/jvmtiGetLoadedClasses.hpp"
  #include "runtime/thread.hpp"
  #include "utilities/stack.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif
  
  
  // The closure for GetLoadedClasses
  class LoadedClassesClosure : public KlassClosure {
--- 28,38 ----
  #include "memory/universe.inline.hpp"
  #include "prims/jvmtiGetLoadedClasses.hpp"
  #include "runtime/thread.hpp"
  #include "utilities/stack.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1BarrierSet.hpp"
  #endif
  
  
  // The closure for GetLoadedClasses
  class LoadedClassesClosure : public KlassClosure {
***************
*** 48,58 ****
    // or a reachable object making it alive again. The SATB part of G1 needs
    // to get notified about this potential resurrection, otherwise the marking
    // might not find the object.
  #if INCLUDE_ALL_GCS
    if (UseG1GC && o != NULL) {
!     G1SATBCardTableModRefBS::enqueue(o);
    }
  #endif
  }
  
  public:
--- 48,58 ----
    // or a reachable object making it alive again. The SATB part of G1 needs
    // to get notified about this potential resurrection, otherwise the marking
    // might not find the object.
  #if INCLUDE_ALL_GCS
    if (UseG1GC && o != NULL) {
!     G1BarrierSet::enqueue(o);
    }
  #endif
  }
  
  public: