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

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 34,43 ****
--- 34,44 ----
  import sun.jvm.hotspot.compiler.*;
  import sun.jvm.hotspot.debugger.*;
  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.*;
  import sun.jvm.hotspot.runtime.*;
  import sun.jvm.hotspot.ui.*;
*** 1106,1115 ****
--- 1107,1120 ----
                              bad = false;
                            } else if (heap.oldGen().isIn(handle)) {
                              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] ";
                            bad = false;
                          }