src/share/vm/gc_implementation/g1/concurrentMark.cpp

@@ -44,10 +44,11 @@
 #include "gc_implementation/shared/gcTraceTime.hpp"
 #include "memory/allocation.hpp"
 #include "memory/genOopClosures.inline.hpp"
 #include "memory/referencePolicy.hpp"
 #include "memory/resourceArea.hpp"
+#include "memory/strongRootsScope.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/atomic.inline.hpp"
 #include "runtime/prefetch.inline.hpp"

@@ -2648,11 +2649,11 @@
 
   G1CMTraceTime trace("Finalize Marking", G1Log::finer());
 
   g1h->ensure_parsability(false);
 
-  G1CollectedHeap::StrongRootsScope srs;
+  StrongRootsScope srs;
   // this is remark, so we'll use up all active threads
   uint active_workers = g1h->workers()->active_workers();
   if (active_workers == 0) {
     assert(active_workers > 0, "Should have been set earlier");
     active_workers = (uint) ParallelGCThreads;