src/share/vm/gc_implementation/parNew/parNewGeneration.cpp

*** 40,50 ****
  #include "memory/genCollectedHeap.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/generation.hpp"
  #include "memory/referencePolicy.hpp"
  #include "memory/resourceArea.hpp"
! #include "memory/sharedHeap.hpp"
  #include "memory/space.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/handles.hpp"
--- 40,50 ----
  #include "memory/genCollectedHeap.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/generation.hpp"
  #include "memory/referencePolicy.hpp"
  #include "memory/resourceArea.hpp"
! #include "memory/strongRootsScope.hpp"
  #include "memory/space.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/handles.hpp"
*** 972,985 ****
    // It turns out that even when we're using 1 thread, doing the work in a
    // separate thread causes wide variance in run times.  We can't help this
    // in the multi-threaded case, but we special-case n=1 here to get
    // repeatable measurements of the 1-thread overhead of the parallel code.
    if (n_workers > 1) {
!     GenCollectedHeap::StrongRootsScope srs;
      workers->run_task(&tsk);
    } else {
!     GenCollectedHeap::StrongRootsScope srs;
      tsk.work(0);
    }
    thread_state_set.reset(0 /* Bad value in debug if not reset */,
                           promotion_failed());
  
--- 972,985 ----
    // It turns out that even when we're using 1 thread, doing the work in a
    // separate thread causes wide variance in run times.  We can't help this
    // in the multi-threaded case, but we special-case n=1 here to get
    // repeatable measurements of the 1-thread overhead of the parallel code.
    if (n_workers > 1) {
!     StrongRootsScope srs;
      workers->run_task(&tsk);
    } else {
!     StrongRootsScope srs;
      tsk.work(0);
    }
    thread_state_set.reset(0 /* Bad value in debug if not reset */,
                           promotion_failed());