--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java	Tue Jun 12 07:52:30 2018 -0700
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java	Tue Jun 12 17:40:28 2018 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,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.*;
@@ -1112,6 +1113,10 @@
                         } else if (collHeap instanceof EpsilonHeap) {
                           anno = "Epsilon ";
                           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] ";