--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java	2017-07-17 11:14:01.558247331 -0400
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java	2017-07-17 11:14:01.179976359 -0400
@@ -25,16 +25,16 @@
 package sun.jvm.hotspot.classfile;
 
 import java.io.PrintStream;
-import java.util.*;
 import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.oops.*;
 import sun.jvm.hotspot.types.*;
 
 public class ClassLoaderData extends VMObject {
   static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
+    VM.registerVMInitializedObserver(new java.util.Observer() {
+        public void update(java.util.Observable o, Object data) {
           initialize(VM.getVM().getTypeDataBase());
         }
       });
@@ -44,19 +44,26 @@
     Type type      = db.lookupType("ClassLoaderData");
     classLoaderField = type.getOopField("_class_loader");
     nextField = type.getAddressField("_next");
-    klassesField = type.getAddressField("_klasses");
+    klassesField = new MetadataField(type.getAddressField("_klasses"), 0);
     isAnonymousField = new CIntField(type.getCIntegerField("_is_anonymous"), 0);
+    dictionaryField = type.getAddressField("_dictionary");
   }
 
   private static sun.jvm.hotspot.types.OopField classLoaderField;
   private static AddressField nextField;
-  private static AddressField klassesField;
+  private static MetadataField  klassesField;
   private static CIntField isAnonymousField;
+  private static AddressField dictionaryField;
 
   public ClassLoaderData(Address addr) {
     super(addr);
   }
 
+  public Dictionary dictionary() {
+      Address tmp = dictionaryField.getValue();
+      return (Dictionary) VMObjectFactory.newObject(Dictionary.class, tmp);
+  }
+
   public static ClassLoaderData instantiateWrapperFor(Address addr) {
     if (addr == null) {
       return null;
@@ -76,7 +83,30 @@
     return instantiateWrapperFor(nextField.getValue(getAddress()));
   }
 
-  public Klass getKlasses() {
-    return (InstanceKlass)Metadata.instantiateWrapperFor(klassesField.getValue(getAddress()));
+  public Klass getKlasses()    { return (Klass)klassesField.getValue(this);  }
+
+  /** Lookup an already loaded class. If not found null is returned. */
+  public Klass find(Symbol className) {
+    for (Klass l = getKlasses(); l != null; l = l.getNextLinkKlass()) {
+        if (className.equals(l.getName())) {
+            return l;
+        }
+    }
+    return null;
+  }
+     
+  /** Iterate over all klasses - including object, primitive
+      array klasses */
+  public void classesDo(ClassLoaderDataGraph.ClassVisitor v) {
+      for (Klass l = getKlasses(); l != null; l = l.getNextLinkKlass()) {
+          v.visit(l);
+      }
+  }
+
+  /** Iterate over all klasses in the dictionary, including initiating loader. */
+  public void allEntriesDo(ClassLoaderDataGraph.ClassAndLoaderVisitor v) {
+      for (Klass l = getKlasses(); l != null; l = l.getNextLinkKlass()) {
+          dictionary().allEntriesDo(v, getClassLoader());
+      }
   }
 }