src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java

*** 27,36 ****
--- 27,37 ----
  import java.io.*;
  import java.lang.reflect.Constructor;
  import java.util.jar.JarOutputStream;
  import java.util.jar.JarEntry;
  import java.util.jar.Manifest;
+ import sun.jvm.hotspot.classfile.*;
  import sun.jvm.hotspot.memory.*;
  import sun.jvm.hotspot.oops.*;
  import sun.jvm.hotspot.debugger.*;
  import sun.jvm.hotspot.runtime.*;
  import sun.jvm.hotspot.tools.*;
*** 98,110 ****
              if (outputDirectory == null && jarStream == null) {
                  String dirName = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
                  setOutputDirectory(dirName);
              }
  
!             // walk through the system dictionary
!             SystemDictionary dict = VM.getVM().getSystemDictionary();
!             dict.classesDo(new SystemDictionary.ClassVisitor() {
                      public void visit(Klass k) {
                          if (k instanceof InstanceKlass) {
                              try {
                                  dumpKlass((InstanceKlass) k);
                              } catch (Exception e) {
--- 99,111 ----
              if (outputDirectory == null && jarStream == null) {
                  String dirName = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
                  setOutputDirectory(dirName);
              }
  
!             // walk through the loaded classes
!             ClassLoaderDataGraph cldg = VM.getVM().getClassLoaderDataGraph();
!             cldg.classesDo(new ClassLoaderDataGraph.ClassVisitor() {
                      public void visit(Klass k) {
                          if (k instanceof InstanceKlass) {
                              try {
                                  dumpKlass((InstanceKlass) k);
                              } catch (Exception e) {