*** old/src/share/vm/gc/g1/g1RootProcessor.cpp	Wed Aug 16 10:56:30 2017
--- new/src/share/vm/gc/g1/g1RootProcessor.cpp	Wed Aug 16 10:56:30 2017

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 36,46 ****
--- 36,45 ----
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RootClosures.hpp"
  #include "gc/g1/g1RootProcessor.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "memory/allocation.inline.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/mutex.hpp"
  #include "services/management.hpp"
  
  void G1RootProcessor::worker_has_discovered_all_strong_classes() {
    assert(ClassUnloadingWithConcurrentMark, "Currently only needed when doing G1 Class Unloading");

*** 269,285 ****
--- 268,277 ----
        ObjectSynchronizer::oops_do(strong_roots);
      }
    }
  
    {
      G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::FlatProfilerRoots, worker_i);
      if (!_process_strong_tasks.is_task_claimed(G1RP_PS_FlatProfiler_oops_do)) {
        FlatProfiler::oops_do(strong_roots);
      }
    }
  
    {
      G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::ManagementRoots, worker_i);
      if (!_process_strong_tasks.is_task_claimed(G1RP_PS_Management_oops_do)) {
        Management::oops_do(strong_roots);
      }
    }