src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Klass.java

*** 25,34 ****
--- 25,35 ----
  package sun.jvm.hotspot.oops;
  
  import java.io.*;
  import java.util.*;
  import sun.jvm.hotspot.debugger.*;
+ import sun.jvm.hotspot.classfile.*;
  import sun.jvm.hotspot.runtime.*;
  import sun.jvm.hotspot.types.*;
  
  public class Klass extends Metadata implements ClassConstants {
    static {
*** 61,70 ****
--- 62,72 ----
      }
      subklass     = new MetadataField(type.getAddressField("_subklass"), 0);
      nextSibling  = new MetadataField(type.getAddressField("_next_sibling"), 0);
      nextLink     = new MetadataField(type.getAddressField("_next_link"), 0);
      vtableLen    = new CIntField(type.getCIntegerField("_vtable_len"), 0);
+     classLoaderData = type.getAddressField("_class_loader_data");
  
      LH_INSTANCE_SLOW_PATH_BIT  = db.lookupIntConstant("Klass::_lh_instance_slow_path_bit").intValue();
      LH_LOG2_ELEMENT_SIZE_SHIFT = db.lookupIntConstant("Klass::_lh_log2_element_size_shift").intValue();
      LH_ELEMENT_TYPE_SHIFT      = db.lookupIntConstant("Klass::_lh_element_type_shift").intValue();
      LH_HEADER_SIZE_SHIFT       = db.lookupIntConstant("Klass::_lh_header_size_shift").intValue();
*** 94,103 ****
--- 96,106 ----
    private static MetadataField  subklass;
    private static MetadataField  nextSibling;
    private static MetadataField  nextLink;
    private static sun.jvm.hotspot.types.Field traceIDField;
    private static CIntField vtableLen;
+   private static AddressField classLoaderData;
  
    private Address getValue(AddressField field) {
      return addr.getAddressAt(field.getOffset());
    }
  
*** 117,126 ****
--- 120,132 ----
    public Klass    getSubklassKlass()    { return (Klass)    subklass.getValue(this);     }
    public Klass    getNextSiblingKlass() { return (Klass)    nextSibling.getValue(this);  }
    public Klass    getNextLinkKlass()    { return (Klass)    nextLink.getValue(this);  }
    public long     getVtableLen()        { return            vtableLen.getValue(this); }
  
+   public ClassLoaderData getClassLoaderData() { return ClassLoaderData.instantiateWrapperFor(classLoaderData.getValue(getAddress())); }
+   public Oop             getClassLoader()     { return   getClassLoaderData().getClassLoader(); }
+ 
    public long traceID() {
      if (traceIDField == null) return 0;
      return traceIDField.getJLong(addr);
    }