--- old/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	2016-09-20 11:16:11.262980836 +0200
+++ new/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	2016-09-20 11:16:11.106974745 +0200
@@ -2340,12 +2340,12 @@
   {
     StrongRootsScope srs(1);
 
-    gch->old_process_roots(&srs,
-                           true,   // young gen as roots
-                           GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                           should_unload_classes(),
-                           &notOlder,
-                           NULL);
+    gch->conc_process_roots(&srs,
+                            true,   // young gen as roots
+                            GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                            should_unload_classes(),
+                            &notOlder,
+                            NULL);
   }
 
   // Now mark from the roots
@@ -2412,12 +2412,12 @@
   {
     StrongRootsScope srs(1);
 
-    gch->old_process_roots(&srs,
-                           true,   // young gen as roots
-                           GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                           should_unload_classes(),
-                           &notOlder,
-                           &cld_closure);
+    gch->conc_process_roots(&srs,
+                            true,   // young gen as roots
+                            GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                            should_unload_classes(),
+                            &notOlder,
+                            &cld_closure);
   }
 
   // Now mark from the roots
@@ -2899,12 +2899,12 @@
 
       StrongRootsScope srs(1);
 
-      gch->old_process_roots(&srs,
-                             true,   // young gen as roots
-                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                             should_unload_classes(),
-                             &notOlder,
-                             &cld_closure);
+      gch->conc_process_roots(&srs,
+                              true,   // young gen as roots
+                              GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                              should_unload_classes(),
+                              &notOlder,
+                              &cld_closure);
     }
   }
 
@@ -4284,12 +4284,12 @@
 
   CLDToOopClosure cld_closure(&par_mri_cl, true);
 
-  gch->old_process_roots(_strong_roots_scope,
-                         false,     // yg was scanned above
-                         GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
-                         _collector->should_unload_classes(),
-                         &par_mri_cl,
-                         &cld_closure);
+  gch->conc_process_roots(_strong_roots_scope,
+                          false,     // yg was scanned above
+                          GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
+                          _collector->should_unload_classes(),
+                          &par_mri_cl,
+                          &cld_closure);
   assert(_collector->should_unload_classes()
          || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
          "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
@@ -4413,12 +4413,12 @@
   // ---------- remaining roots --------------
   _timer.reset();
   _timer.start();
-  gch->old_process_roots(_strong_roots_scope,
-                         false,     // yg was scanned above
-                         GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
-                         _collector->should_unload_classes(),
-                         &par_mrias_cl,
-                         NULL);     // The dirty klasses will be handled below
+  gch->conc_process_roots(_strong_roots_scope,
+                          false,     // yg was scanned above
+                          GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
+                          _collector->should_unload_classes(),
+                          &par_mrias_cl,
+                          NULL);     // The dirty klasses will be handled below
 
   assert(_collector->should_unload_classes()
          || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
@@ -4960,12 +4960,12 @@
     gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
     StrongRootsScope srs(1);
 
-    gch->old_process_roots(&srs,
-                           true,  // young gen as roots
-                           GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                           should_unload_classes(),
-                           &mrias_cl,
-                           NULL); // The dirty klasses will be handled below
+    gch->conc_process_roots(&srs,
+                            true,  // young gen as roots
+                            GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                            should_unload_classes(),
+                            &mrias_cl,
+                            NULL); // The dirty klasses will be handled below
 
     assert(should_unload_classes()
            || (roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),