--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Wed Oct 21 15:18:30 2015 +0200
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Wed Oct 05 13:35:57 2016 +0200
@@ -2340,7 +2340,7 @@
{
StrongRootsScope srs(1);
- gch->old_process_roots(&srs,
+ gch->cms_process_roots(&srs,
true, // young gen as roots
GenCollectedHeap::ScanningOption(roots_scanning_options()),
should_unload_classes(),
@@ -2412,7 +2412,7 @@
{
StrongRootsScope srs(1);
- gch->old_process_roots(&srs,
+ gch->cms_process_roots(&srs,
true, // young gen as roots
GenCollectedHeap::ScanningOption(roots_scanning_options()),
should_unload_classes(),
@@ -2899,7 +2899,7 @@
StrongRootsScope srs(1);
- gch->old_process_roots(&srs,
+ gch->cms_process_roots(&srs,
true, // young gen as roots
GenCollectedHeap::ScanningOption(roots_scanning_options()),
should_unload_classes(),
@@ -4284,7 +4284,7 @@
CLDToOopClosure cld_closure(&par_mri_cl, true);
- gch->old_process_roots(_strong_roots_scope,
+ gch->cms_process_roots(_strong_roots_scope,
false, // yg was scanned above
GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
_collector->should_unload_classes(),
@@ -4413,7 +4413,7 @@
// ---------- remaining roots --------------
_timer.reset();
_timer.start();
- gch->old_process_roots(_strong_roots_scope,
+ gch->cms_process_roots(_strong_roots_scope,
false, // yg was scanned above
GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
_collector->should_unload_classes(),
@@ -4960,7 +4960,7 @@
gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
StrongRootsScope srs(1);
- gch->old_process_roots(&srs,
+ gch->cms_process_roots(&srs,
true, // young gen as roots
GenCollectedHeap::ScanningOption(roots_scanning_options()),
should_unload_classes(),