stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8244203: sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java fails with NullPointerException

Browse Source 
Reviewed-by: sspitsyn, dtitov
This commit is contained in:
Chris Plummer 2020-05-22 13:29:26 -07:00
parent 4aa057013c
commit 9dc6f10755
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java
View File

@ -92,7 +92,11 @@ public class ClassLoaderData extends VMObject {
public Klass find(String className) {
for (Klass l = getKlasses(); l != null; l = l.getNextLinkKlass()) {
if (l.getName().equals(className)) {
return l;
if (l instanceof InstanceKlass && !((InstanceKlass)l).isLoaded()) {
return null; // don't return partially loaded classes
} else {
return l;
}
}
}
return null;
@ -102,14 +106,17 @@ public class ClassLoaderData extends VMObject {
array klasses */
public void classesDo(ClassLoaderDataGraph.ClassVisitor v) {
for (Klass l = getKlasses(); l != null; l = l.getNextLinkKlass()) {
// Only visit InstanceKlasses that are at least in the "loaded" init_state. Otherwise
// the InstanceKlass won't have some required fields initialized, which can cause problems.
if (l instanceof InstanceKlass && !((InstanceKlass)l).isLoaded()) {
continue;
}
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());
}
dictionary().allEntriesDo(v, getClassLoader());
}
}

5
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/Dictionary.java
View File

@ -65,6 +65,11 @@ public class Dictionary extends sun.jvm.hotspot.utilities.Hashtable {
for (DictionaryEntry probe = (DictionaryEntry) bucket(index); probe != null;
probe = (DictionaryEntry) probe.next()) {
Klass k = probe.klass();
// Only visit InstanceKlasses that are at least in the "loaded" init_state. Otherwise
// the InstanceKlass won't have some required fields initialized, which can cause problems.
if (k instanceof InstanceKlass && !((InstanceKlass)k).isLoaded()) {
continue;
}
v.visit(k, loader);
}
}

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

@ -145,6 +145,18 @@ public class InstanceKlass extends Klass {
public InstanceKlass(Address addr) {
super(addr);
// If the class hasn't yet reached the "loaded" init state, then don't go any further
// or we'll run into problems trying to look at fields that are not yet setup.
// Attempted lookups of this InstanceKlass via ClassLoaderDataGraph, ClassLoaderData,
// and Dictionary will all refuse to return it. The main purpose of allowing this
// InstanceKlass to initialize is so ClassLoaderData.getKlasses() will succeed, allowing
// ClassLoaderData.classesDo() to iterate over all Klasses (skipping those that are
// not yet fully loaded).
if (!isLoaded()) {
return;
}
if (getJavaFieldsCount() != getAllFieldsCount()) {
// Exercise the injected field logic
for (int i = getJavaFieldsCount(); i < getAllFieldsCount(); i++) {

8
test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java
View File

@ -78,8 +78,12 @@ public class ClhsdbClasses {
expStrMap.put(printCmd,
List.of("public class " + APP_DOT_CLASSNAME + " @" + classAddress));
expStrMap.put(classesCmd, List.of(
APP_SLASH_CLASSNAME + " @" + classAddress,
"java/lang/Class @0x"));
APP_SLASH_CLASSNAME + " @" + classAddress, // check for app class at right address
"java/lang/Class @0x", // check for java/lang/Class
"java/lang/Object @0x", // check for java/lang/Object
"java/lang/Cloneable @0x", // check for an interface type
"\\[Ljava/lang/String; @0x", // check for array type
"\\[J @0x", "\\[I @0x", "\\[Z @0x")); // check for array of a few pimitive types
test.run(theApp.getPid(), cmds, expStrMap, null);
}
} catch (SkippedException se) {