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

*** 89,99 ****
      localInterfaces      = type.getAddressField("_local_interfaces");
      transitiveInterfaces = type.getAddressField("_transitive_interfaces");
      fields               = type.getAddressField("_fields");
      javaFieldsCount      = new CIntField(type.getCIntegerField("_java_fields_count"), 0);
      constants            = new MetadataField(type.getAddressField("_constants"), 0);
-     classLoaderData      = type.getAddressField("_class_loader_data");
      sourceDebugExtension = type.getAddressField("_source_debug_extension");
      innerClasses         = type.getAddressField("_inner_classes");
      sourceFileNameIndex  = new CIntField(type.getCIntegerField("_source_file_name_index"), 0);
      nonstaticFieldSize   = new CIntField(type.getCIntegerField("_nonstatic_field_size"), 0);
      staticFieldSize      = new CIntField(type.getCIntegerField("_static_field_size"), 0);
--- 89,98 ----
*** 164,174 ****
    private static AddressField  localInterfaces;
    private static AddressField  transitiveInterfaces;
    private static AddressField fields;
    private static CIntField javaFieldsCount;
    private static MetadataField constants;
-   private static AddressField  classLoaderData;
    private static AddressField  sourceDebugExtension;
    private static AddressField  innerClasses;
    private static CIntField sourceFileNameIndex;
    private static CIntField nonstaticFieldSize;
    private static CIntField staticFieldSize;
--- 163,172 ----
*** 326,336 ****
        // Java code, so let's do this by looking up from the shared dictionary. Of course,
        // this works for shared InstanceKlass only and does not work for other types of
        // MetaspaceObj in the CDS shared archive.
        Dictionary sharedDictionary = vm.getSystemDictionary().sharedDictionary();
        if (sharedDictionary != null) {
!         if (sharedDictionary.contains(this, null)) {
            return true;
          }
        }
      }
      return false;
--- 324,334 ----
        // Java code, so let's do this by looking up from the shared dictionary. Of course,
        // this works for shared InstanceKlass only and does not work for other types of
        // MetaspaceObj in the CDS shared archive.
        Dictionary sharedDictionary = vm.getSystemDictionary().sharedDictionary();
        if (sharedDictionary != null) {
!         if (sharedDictionary.contains(this)) {
            return true;
          }
        }
      }
      return false;
*** 446,457 ****
        }
      }
      return allFieldsCount;
    }
    public ConstantPool getConstants()        { return (ConstantPool) constants.getValue(this); }
-   public ClassLoaderData getClassLoaderData() { return                ClassLoaderData.instantiateWrapperFor(classLoaderData.getValue(getAddress())); }
-   public Oop       getClassLoader()         { return                getClassLoaderData().getClassLoader(); }
    public Symbol    getSourceFileName()      { return                getConstants().getSymbolAt(sourceFileNameIndex.getValue(this)); }
    public String    getSourceDebugExtension(){ return                CStringUtilities.getString(sourceDebugExtension.getValue(getAddress())); }
    public long      getNonstaticFieldSize()  { return                nonstaticFieldSize.getValue(this); }
    public long      getStaticOopFieldCount() { return                staticOopFieldCount.getValue(this); }
    public long      getNonstaticOopMapSize() { return                nonstaticOopMapSize.getValue(this); }
--- 444,453 ----