src/share/vm/memory/sharedHeap.cpp

*** 43,52 ****
--- 43,53 ----
    SH_PS_JNIHandles_oops_do,
    SH_PS_ObjectSynchronizer_oops_do,
    SH_PS_FlatProfiler_oops_do,
    SH_PS_Management_oops_do,
    SH_PS_SystemDictionary_oops_do,
+   SH_PS_ClassLoaderDataGraph_oops_do,
    SH_PS_jvmti_oops_do,
    SH_PS_StringTable_oops_do,
    SH_PS_CodeCache_oops_do,
    // Leave this one last.
    SH_PS_NumElements
*** 171,189 ****
      JvmtiExport::oops_do(roots);
  
    if (!_process_strong_tasks->is_task_claimed(SH_PS_SystemDictionary_oops_do)) {
      if (so & SO_AllClasses) {
        SystemDictionary::oops_do(roots);
-       ClassLoaderDataGraph::oops_do(roots, klass_closure, !is_scavenging);
      } else if (so & SO_SystemClasses) {
        SystemDictionary::always_strong_oops_do(roots);
-       ClassLoaderDataGraph::always_strong_oops_do(roots, klass_closure, !is_scavenging);
      } else {
        fatal("We should always have selected either SO_AllClasses or SO_SystemClasses");
      }
    }
  
    if (!_process_strong_tasks->is_task_claimed(SH_PS_StringTable_oops_do)) {
      if (so & SO_Strings) {
        StringTable::oops_do(roots);
      }
    }
--- 172,196 ----
      JvmtiExport::oops_do(roots);
  
    if (!_process_strong_tasks->is_task_claimed(SH_PS_SystemDictionary_oops_do)) {
      if (so & SO_AllClasses) {
        SystemDictionary::oops_do(roots);
      } else if (so & SO_SystemClasses) {
        SystemDictionary::always_strong_oops_do(roots);
      } else {
        fatal("We should always have selected either SO_AllClasses or SO_SystemClasses");
      }
    }
  
+   if (!_process_strong_tasks->is_task_claimed(SH_PS_ClassLoaderDataGraph_oops_do)) {
+     if (so & SO_AllClasses) {
+       ClassLoaderDataGraph::oops_do(roots, klass_closure, !is_scavenging);
+     } else if (so & SO_SystemClasses) {
+       ClassLoaderDataGraph::always_strong_oops_do(roots, klass_closure, !is_scavenging);
+     }
+   }
+ 
    if (!_process_strong_tasks->is_task_claimed(SH_PS_StringTable_oops_do)) {
      if (so & SO_Strings) {
        StringTable::oops_do(roots);
      }
    }