src/hotspot/share/gc/z/zRootsIterator.cpp

*** 22,32 ****
   */
  
  #include "precompiled.hpp"
  #include "classfile/classLoaderData.hpp"
  #include "classfile/stringTable.hpp"
- #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "compiler/oopMap.hpp"
  #include "gc/shared/oopStorageParState.inline.hpp"
  #include "gc/z/zGlobals.hpp"
--- 22,31 ----
*** 72,82 ****
  static const ZStatSubPhase ZSubPhasePauseWeakRootsTeardown("Pause Weak Roots Teardown");
  static const ZStatSubPhase ZSubPhasePauseWeakRootsVMWeakHandles("Pause Weak Roots VMWeakHandles");
  static const ZStatSubPhase ZSubPhasePauseWeakRootsJNIWeakHandles("Pause Weak Roots JNIWeakHandles");
  static const ZStatSubPhase ZSubPhasePauseWeakRootsJVMTIWeakExport("Pause Weak Roots JVMTIWeakExport");
  static const ZStatSubPhase ZSubPhasePauseWeakRootsJFRWeak("Pause Weak Roots JFRWeak");
- static const ZStatSubPhase ZSubPhasePauseWeakRootsSymbolTable("Pause Weak Roots SymbolTable");
  static const ZStatSubPhase ZSubPhasePauseWeakRootsStringTable("Pause Weak Roots StringTable");
  
  static const ZStatSubPhase ZSubPhaseConcurrentWeakRoots("Concurrent Weak Roots");
  static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsVMWeakHandles("Concurrent Weak Roots VMWeakHandles");
  static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsJNIWeakHandles("Concurrent Weak Roots JNIWeakHandles");
--- 71,80 ----
*** 300,314 ****
      _string_table_iter(StringTable::weak_storage()),
      _jvmti_weak_export(this),
      _jfr_weak(this),
      _vm_weak_handles(this),
      _jni_weak_handles(this),
-     _symbol_table(this),
      _string_table(this) {
    assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
    ZStatTimer timer(ZSubPhasePauseWeakRootsSetup);
-   SymbolTable::clear_parallel_claimed_index();
    StringTable::reset_dead_counter();
  }
  
  ZWeakRootsIterator::~ZWeakRootsIterator() {
    ZStatTimer timer(ZSubPhasePauseWeakRootsTeardown);
--- 298,310 ----
*** 335,350 ****
    ZStatTimer timer(ZSubPhasePauseWeakRootsJFRWeak);
    Jfr::weak_oops_do(is_alive, cl);
  #endif
  }
  
- void ZWeakRootsIterator::do_symbol_table(BoolObjectClosure* is_alive, OopClosure* cl) {
-   ZStatTimer timer(ZSubPhasePauseWeakRootsSymbolTable);
-   int dummy;
-   SymbolTable::possibly_parallel_unlink(&dummy, &dummy);
- }
- 
  class ZStringTableDeadCounterBoolObjectClosure : public BoolObjectClosure  {
  private:
    BoolObjectClosure* const _cl;
    size_t                   _ndead;
  
--- 331,340 ----
*** 373,385 ****
    _string_table_iter.weak_oops_do(&counter_is_alive, cl);
  }
  
  void ZWeakRootsIterator::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* cl) {
    ZStatTimer timer(ZSubPhasePauseWeakRoots);
-   if (ZSymbolTableUnloading) {
-     _symbol_table.weak_oops_do(is_alive, cl);
-   }
    if (ZWeakRoots) {
      _jvmti_weak_export.weak_oops_do(is_alive, cl);
      _jfr_weak.weak_oops_do(is_alive, cl);
      if (!ZConcurrentVMWeakHandles) {
        _vm_weak_handles.weak_oops_do(is_alive, cl);
--- 363,372 ----