--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	2018-10-18 18:02:06.000000000 -0400
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	2018-10-18 18:02:06.000000000 -0400
@@ -225,21 +225,24 @@
 
    public void printG1HeapSummary(G1CollectedHeap g1h) {
       G1MonitoringSupport g1mm = g1h.g1mm();
-      long edenSpaceRegionNum = g1mm.edenSpaceRegionNum();
-      long survivorSpaceRegionNum = g1mm.survivorSpaceRegionNum();
-      HeapRegionSetBase oldSet = g1h.oldSet();
-      HeapRegionSetBase archiveSet = g1h.archiveSet();
-      HeapRegionSetBase humongousSet = g1h.humongousSet();
-      long oldGenRegionNum = oldSet.length() + archiveSet.length() + humongousSet.length();
-      printG1Space("G1 Heap:", g1h.n_regions(),
-                   g1h.used(), g1h.capacity());
+      printG1Space("G1 Heap:", g1h.n_regions(), g1h.used(), g1h.capacity());
       System.out.println("G1 Young Generation:");
-      printG1Space("Eden Space:", edenSpaceRegionNum,
+      printG1Space("Eden Space:", g1mm.edenSpaceRegionNum(),
                    g1mm.edenSpaceUsed(), g1mm.edenSpaceCommitted());
-      printG1Space("Survivor Space:", survivorSpaceRegionNum,
+      printG1Space("Survivor Space:", g1mm.survivorSpaceRegionNum(),
                    g1mm.survivorSpaceUsed(), g1mm.survivorSpaceCommitted());
-      printG1Space("G1 Old Generation:", oldGenRegionNum,
-                   g1mm.oldGenUsed(), g1mm.oldGenCommitted());
+      if (g1mm.useLegacyMonitoring()) {
+          printG1Space("G1 Old Generation:", g1mm.oldSpaceRegionNum(),
+                       g1mm.oldSpaceUsed(), g1mm.oldSpaceCommitted());
+      } else {
+          System.out.println("G1 Old Generation:");
+          printG1Space("G1 Old Space:", g1mm.oldSpaceRegionNum(),
+                       g1mm.oldSpaceUsed(), g1mm.oldSpaceCommitted());
+          printG1Space("G1 Archive Space:", g1mm.archiveSpaceRegionNum(),
+                       g1mm.archiveSpaceUsed(), g1mm.archiveSpaceCommitted());
+          printG1Space("G1 Humongous Space:", g1mm.humongousSpaceRegionNum(),
+                       g1mm.humongousSpaceUsed(), g1mm.humongousSpaceCommitted());
+      }
    }
 
    private void printG1Space(String spaceName, long regionNum,