*** old/src/share/vm/gc/shared/genCollectedHeap.cpp	Wed Aug 16 10:56:37 2017
--- new/src/share/vm/gc/shared/genCollectedHeap.cpp	Wed Aug 16 10:56:37 2017

*** 44,54 ****
--- 44,53 ----
  #include "gc/shared/workgroup.hpp"
  #include "memory/filemap.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/vmThread.hpp"
  #include "services/management.hpp"

*** 68,78 ****
--- 67,76 ----
  // The set of potentially parallel tasks in root scanning.
  enum GCH_strong_roots_tasks {
    GCH_PS_Universe_oops_do,
    GCH_PS_JNIHandles_oops_do,
    GCH_PS_ObjectSynchronizer_oops_do,
    GCH_PS_FlatProfiler_oops_do,
    GCH_PS_Management_oops_do,
    GCH_PS_SystemDictionary_oops_do,
    GCH_PS_ClassLoaderDataGraph_oops_do,
    GCH_PS_jvmti_oops_do,
    GCH_PS_CodeCache_oops_do,

*** 601,613 ****
--- 599,608 ----
    }
  
    if (!_process_strong_tasks->is_task_claimed(GCH_PS_ObjectSynchronizer_oops_do)) {
      ObjectSynchronizer::oops_do(strong_roots);
    }
    if (!_process_strong_tasks->is_task_claimed(GCH_PS_FlatProfiler_oops_do)) {
      FlatProfiler::oops_do(strong_roots);
    }
    if (!_process_strong_tasks->is_task_claimed(GCH_PS_Management_oops_do)) {
      Management::oops_do(strong_roots);
    }
    if (!_process_strong_tasks->is_task_claimed(GCH_PS_jvmti_oops_do)) {
      JvmtiExport::oops_do(strong_roots);