*** old/src/share/vm/gc/parallel/psMarkSweep.cpp	Fri Aug 18 12:12:53 2017
--- new/src/share/vm/gc/parallel/psMarkSweep.cpp	Fri Aug 18 12:12:53 2017

*** 48,58 ****
--- 48,57 ----
  #include "gc/shared/referenceProcessor.hpp"
  #include "gc/shared/spaceDecorator.hpp"
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/safepoint.hpp"
  #include "runtime/vmThread.hpp"
  #include "services/management.hpp"
  #include "services/memoryService.hpp"
  #include "utilities/align.hpp"

*** 508,518 ****
--- 507,516 ----
      Universe::oops_do(mark_and_push_closure());
      JNIHandles::oops_do(mark_and_push_closure());   // Global (strong) JNI handles
      MarkingCodeBlobClosure each_active_code_blob(mark_and_push_closure(), !CodeBlobToOopClosure::FixRelocations);
      Threads::oops_do(mark_and_push_closure(), &each_active_code_blob);
      ObjectSynchronizer::oops_do(mark_and_push_closure());
      FlatProfiler::oops_do(mark_and_push_closure());
      Management::oops_do(mark_and_push_closure());
      JvmtiExport::oops_do(mark_and_push_closure());
      SystemDictionary::always_strong_oops_do(mark_and_push_closure());
      ClassLoaderDataGraph::always_strong_cld_do(follow_cld_closure());
      // Do not treat nmethods as strong roots for mark/sweep, since we can unload them.

*** 599,609 ****
--- 597,606 ----
    // General strong roots.
    Universe::oops_do(adjust_pointer_closure());
    JNIHandles::oops_do(adjust_pointer_closure());   // Global (strong) JNI handles
    Threads::oops_do(adjust_pointer_closure(), NULL);
    ObjectSynchronizer::oops_do(adjust_pointer_closure());
    FlatProfiler::oops_do(adjust_pointer_closure());
    Management::oops_do(adjust_pointer_closure());
    JvmtiExport::oops_do(adjust_pointer_closure());
    SystemDictionary::oops_do(adjust_pointer_closure());
    ClassLoaderDataGraph::cld_do(adjust_cld_closure());