--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java	2018-06-06 00:37:33.353485000 +0200
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java	2018-06-06 00:37:33.095473889 +0200
@@ -36,6 +36,7 @@
 import sun.jvm.hotspot.gc.parallel.*;
 import sun.jvm.hotspot.gc.shared.*;
 import sun.jvm.hotspot.gc.g1.*;
+import sun.jvm.hotspot.gc.z.*;
 import sun.jvm.hotspot.interpreter.*;
 import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.oops.*;
@@ -1108,6 +1109,10 @@
                             anno = "PSOldGen ";
                             bad = false;
                           }
+                        } else if (collHeap instanceof ZCollectedHeap) {
+                          ZCollectedHeap heap = (ZCollectedHeap) collHeap;
+                          anno ="ZHeap";
+                          bad = false;
                         } else {
                           // Optimistically assume the oop isn't bad
                           anno = "[Unknown generation] ";