agent/src/share/classes/sun/jvm/hotspot/HSDB.java

@@ -34,10 +34,11 @@
 
 import sun.jvm.hotspot.code.*;
 import sun.jvm.hotspot.compiler.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
+import sun.jvm.hotspot.gc_implementation.shenandoah.*;
 import sun.jvm.hotspot.gc_interface.*;
 import sun.jvm.hotspot.interpreter.*;
 import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.oops.*;
 import sun.jvm.hotspot.runtime.*;

@@ -1089,10 +1090,14 @@
                             bad = false;
                           } else if (heap.oldGen().isIn(handle)) {
                             anno = "PSOldGen ";
                             bad = false;
                           }
+                        } else if (collHeap instanceof ShenandoahHeap) {
+                          ShenandoahHeap heap = (ShenandoahHeap) collHeap;
+                          anno = "ShenandoahHeap ";
+                          bad = false;
                         } else {
                           // Optimistically assume the oop isn't bad
                           anno = "[Unknown generation] ";
                           bad = false;
                         }