src/hotspot/share/gc/shared/genCollectedHeap.cpp

rev 48000 : [mq]: open.patch
rev 48001 : [mq]: 8191564-new.patch

@@ -262,17 +262,17 @@
 bool GenCollectedHeap::must_clear_all_soft_refs() {
   return _gc_cause == GCCause::_metadata_GC_clear_soft_refs ||
          _gc_cause == GCCause::_wb_full_gc;
 }
 
-void GenCollectedHeap::collect_generation(Generation* gen, GCMemoryManager* mem_mgr, bool full, size_t size,
+void GenCollectedHeap::collect_generation(Generation* gen, bool full, size_t size,
                                           bool is_tlab, bool run_verification, bool clear_soft_refs,
                                           bool restore_marks_for_biased_locking) {
   FormatBuffer<> title("Collect gen: %s", gen->short_name());
   GCTraceTime(Trace, gc, phases) t1(title);
   TraceCollectorStats tcs(gen->counters());
-  TraceMemoryManagerStats tmms(mem_mgr, gc_cause());
+  TraceMemoryManagerStats tmms(gen->gc_manager(), gc_cause());
 
   gen->stat_record()->invocations++;
   gen->stat_record()->accumulated_time.start();
 
   // Must be done anew before each collection because

@@ -412,11 +412,10 @@
         prepare_for_verify();
         prepared_for_verification = true;
       }
 
       collect_generation(_young_gen,
-                         _young_mgr,
                          full,
                          size,
                          is_tlab,
                          run_verification && VerifyGCLevel <= 0,
                          do_clear_all_soft_refs,

@@ -444,14 +443,14 @@
 
       if (do_young_collection) {
         // We did a young GC. Need a new GC id for the old GC.
         GCIdMarkAndRestore gc_id_mark;
         GCTraceTime(Info, gc) t("Pause Full", NULL, gc_cause(), true);
-        collect_generation(_old_gen, _old_mgr, full, size, is_tlab, run_verification && VerifyGCLevel <= 1, do_clear_all_soft_refs, true);
+        collect_generation(_old_gen, full, size, is_tlab, run_verification && VerifyGCLevel <= 1, do_clear_all_soft_refs, true);
       } else {
         // No young GC done. Use the same GC id as was set up earlier in this method.
-        collect_generation(_old_gen, _old_mgr, full, size, is_tlab, run_verification && VerifyGCLevel <= 1, do_clear_all_soft_refs, true);
+        collect_generation(_old_gen, full, size, is_tlab, run_verification && VerifyGCLevel <= 1, do_clear_all_soft_refs, true);
       }
 
       must_restore_marks_for_biased_locking = true;
       collected_old = true;
     }