--- old/src/hotspot/share/gc/shared/genCollectedHeap.cpp	2017-11-28 11:57:12.060679411 +0100
+++ new/src/hotspot/share/gc/shared/genCollectedHeap.cpp	2017-11-28 11:57:11.803682392 +0100
@@ -264,13 +264,13 @@
          _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();
@@ -414,7 +414,6 @@
       }
 
       collect_generation(_young_gen,
-                         _young_mgr,
                          full,
                          size,
                          is_tlab,
@@ -446,10 +445,10 @@
         // 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;