src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp

*** 25,22 ***
  #include "precompiled.hpp"
  #include "aot/aotLoader.hpp"
  #include "classfile/classLoaderDataGraph.hpp"
  #include "classfile/stringTable.hpp"
  #include "gc/shared/oopStorage.inline.hpp"
! #include "gc/shared/oopStorageSet.hpp"
  #include "gc/shared/strongRootsScope.hpp"
  #include "jfr/leakprofiler/chains/bfsClosure.hpp"
  #include "jfr/leakprofiler/chains/dfsClosure.hpp"
  #include "jfr/leakprofiler/chains/edgeQueue.hpp"
  #include "jfr/leakprofiler/chains/rootSetClosure.hpp"
  #include "jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp"
  #include "memory/universe.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "prims/jvmtiExport.hpp"
- #include "runtime/jniHandles.inline.hpp"
  #include "runtime/synchronizer.hpp"
  #include "runtime/thread.hpp"
  #include "services/management.hpp"
  #include "utilities/align.hpp"
  
--- 25,21 ---
  #include "precompiled.hpp"
  #include "aot/aotLoader.hpp"
  #include "classfile/classLoaderDataGraph.hpp"
  #include "classfile/stringTable.hpp"
  #include "gc/shared/oopStorage.inline.hpp"
! #include "gc/shared/oopStorageSet.inline.hpp"
  #include "gc/shared/strongRootsScope.hpp"
  #include "jfr/leakprofiler/chains/bfsClosure.hpp"
  #include "jfr/leakprofiler/chains/dfsClosure.hpp"
  #include "jfr/leakprofiler/chains/edgeQueue.hpp"
  #include "jfr/leakprofiler/chains/rootSetClosure.hpp"
  #include "jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp"
  #include "memory/universe.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "runtime/synchronizer.hpp"
  #include "runtime/thread.hpp"
  #include "services/management.hpp"
  #include "utilities/align.hpp"
  

*** 74,13 ***
    ClassLoaderDataGraph::always_strong_cld_do(&cldt_closure);
    // We don't follow code blob oops, because they have misaligned oops.
    Threads::oops_do(this, NULL);
    ObjectSynchronizer::oops_do(this);
    Universe::oops_do(this);
-   JNIHandles::oops_do(this);
    JvmtiExport::oops_do(this);
!   OopStorageSet::vm_global()->oops_do(this);
    Management::oops_do(this);
    AOTLoader::oops_do(this);
  }
  
  template class RootSetClosure<BFSClosure>;
--- 73,12 ---
    ClassLoaderDataGraph::always_strong_cld_do(&cldt_closure);
    // We don't follow code blob oops, because they have misaligned oops.
    Threads::oops_do(this, NULL);
    ObjectSynchronizer::oops_do(this);
    Universe::oops_do(this);
    JvmtiExport::oops_do(this);
!   OopStorageSet::strong_oops_do(this);
    Management::oops_do(this);
    AOTLoader::oops_do(this);
  }
  
  template class RootSetClosure<BFSClosure>;