agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java

@@ -32,10 +32,11 @@
 import java.util.*;
 
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.gc_interface.*;
 import sun.jvm.hotspot.gc_implementation.g1.*;
+import sun.jvm.hotspot.gc_implementation.shenandoah.*;
 import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
 import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.utilities.*;

@@ -435,14 +436,17 @@
        PSOldGen oldGen = psh.oldGen();
        addLiveRegions("old ", oldGen.objectSpace().getLiveRegions(), liveRegions);
     } else if (heap instanceof G1CollectedHeap) {
         G1CollectedHeap g1h = (G1CollectedHeap) heap;
         g1h.heapRegionIterate(lrc);
+    } else if (heap instanceof ShenandoahHeap) {
+       ShenandoahHeap sh = (ShenandoahHeap) heap;
+       addLiveRegions("heap", sh.getLiveRegions(), liveRegions);
     } else {
        if (Assert.ASSERTS_ENABLED) {
           Assert.that(false, "Expecting GenCollectedHeap, G1CollectedHeap, " +
-                      "or ParallelScavengeHeap, but got " +
+                      "SheandoahHeap or ParallelScavengeHeap, but got " +
                       heap.getClass().getName());
        }
     }
 
     // If UseTLAB is enabled, snip out regions associated with TLABs'