infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-06 21:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

SA; more runtime tests

Browse Source
This commit is contained in:
tstuefe 2025-11-18 08:06:11 +01:00
parent e56cbf1d4f
commit 1f089c4090
7 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Array.java
View File

@ -83,10 +83,8 @@ public class Array extends Oop {
}
if (VM.getVM().isCompactObjectHeadersEnabled()) {
lengthOffsetInBytes = Oop.getHeaderSize();
} else if (VM.getVM().isCompressedKlassPointersEnabled()) {
lengthOffsetInBytes = typeSize - VM.getVM().getIntSize();
} else {
lengthOffsetInBytes = typeSize;
lengthOffsetInBytes = typeSize - VM.getVM().getIntSize();
}
return lengthOffsetInBytes;
}

4
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Instance.java
View File

@ -57,10 +57,8 @@ public class Instance extends Oop {
public static long getHeaderSize() {
if (VM.getVM().isCompactObjectHeadersEnabled()) {
return Oop.getHeaderSize();
} else if (VM.getVM().isCompressedKlassPointersEnabled()) {
return typeSize - VM.getVM().getIntSize();
} else {
return typeSize;
return typeSize - VM.getVM().getIntSize();
}
}

15
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Oop.java
View File

@ -83,12 +83,9 @@ public class Oop {
public Klass getKlass() {
if (VM.getVM().isCompactObjectHeadersEnabled()) {
assert(VM.getVM().isCompressedKlassPointersEnabled());
return getMark().getKlass();
} else if (VM.getVM().isCompressedKlassPointersEnabled()) {
return (Klass)compressedKlass.getValue(getHandle());
} else {
return (Klass)klass.getValue(getHandle());
return (Klass)compressedKlass.getValue(getHandle());
}
}
@ -157,11 +154,7 @@ public class Oop {
if (doVMFields) {
visitor.doCInt(mark, true);
if (!VM.getVM().isCompactObjectHeadersEnabled()) {
if (VM.getVM().isCompressedKlassPointersEnabled()) {
visitor.doMetadata(compressedKlass, true);
} else {
visitor.doMetadata(klass, true);
}
visitor.doMetadata(compressedKlass, true);
}
}
}
@ -220,10 +213,8 @@ public class Oop {
if (VM.getVM().isCompactObjectHeadersEnabled()) {
Mark mark = new Mark(handle);
return mark.getKlass();
} else if (VM.getVM().isCompressedKlassPointersEnabled()) {
return (Klass)Metadata.instantiateWrapperFor(handle.getCompKlassAddressAt(compressedKlass.getOffset()));
} else {
return (Klass)Metadata.instantiateWrapperFor(handle.getAddressAt(klass.getOffset()));
return (Klass)Metadata.instantiateWrapperFor(handle.getCompKlassAddressAt(compressedKlass.getOffset()));
}
}
};

16
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java
View File

@ -144,7 +144,6 @@ public class VM {
private static CIntegerType boolType;
private Boolean sharingEnabled;
private Boolean compressedOopsEnabled;
private Boolean compressedKlassPointersEnabled;
private Boolean compactObjectHeadersEnabled;
// command line flags supplied to VM - see struct JVMFlag in jvmFlag.hpp
@ -515,11 +514,7 @@ public class VM {
heapOopSize = (int)getOopSize();
}
if (isCompressedKlassPointersEnabled()) {
klassPtrSize = (int)getIntSize();
} else {
klassPtrSize = (int)getOopSize(); // same as an oop
}
klassPtrSize = (int)getIntSize();
}
/** This could be used by a reflective runtime system */
@ -938,15 +933,6 @@ public class VM {
return compressedOopsEnabled.booleanValue();
}
public boolean isCompressedKlassPointersEnabled() {
if (compressedKlassPointersEnabled == null) {
Flag flag = getCommandLineFlag("USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE");
compressedKlassPointersEnabled = (flag == null) ? Boolean.FALSE:
(flag.getBool()? Boolean.TRUE: Boolean.FALSE);
}
return compressedKlassPointersEnabled.booleanValue();
}
public boolean isCompactObjectHeadersEnabled() {
if (compactObjectHeadersEnabled == null) {
Flag flag = getCommandLineFlag("UseCompactObjectHeaders");

1
test/hotspot/jtreg/runtime/ErrorHandling/TestVMConfigInHsErrFile.java
View File

@ -92,7 +92,6 @@ public class TestVMConfigInHsErrFile {
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:-UseCompactObjectHeaders",
"-XX:+USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE",
"-Xmx100M",
"-XX:-CreateCoredumpOnCrash",
"-XX:ErrorHandlerTest=14",

2
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java
View File

@ -61,7 +61,7 @@ public class SysDictCrash {
if (!output.getStdout().contains("UseCompressedOops disabled due to")) {
throw re;
} else {
System.out.println("Shared archive was not created due to UseCompressedOops and USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE have been disabled.");
System.out.println("Shared archive was not created due to UseCompressedOops being disabled.");
continueTest = false;
}
}

19
test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
View File

@ -164,25 +164,6 @@ public class TestIRMatching {
BadFailOnConstraint.create(RunTests.class, "bad1(int)", 2, "Load")
);
runCheck(new String[] {"-XX:+IgnoreUnrecognizedVMOptions", "-XX:-USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE"},
BadFailOnConstraint.create(Loads.class, "load()", 1, 1, "Load"),
BadFailOnConstraint.create(Loads.class, "load()", 1, 3, "LoadI"),
BadCountsConstraint.create(Loads.class, "load()", 1, 1, 0),
BadCountsConstraint.create(Loads.class, "load()", 1, 2, 1,"Load"),
GoodRuleConstraint.create(Loads.class, "load()", 2),
GoodFailOnConstraint.create(Loads.class, "load()", 3),
BadCountsConstraint.create(Loads.class, "load()", 3, 2, 2,"Store"),
BadFailOnConstraint.create(Loads.class, "load()", 4, 2, "Store"),
BadFailOnConstraint.create(Loads.class, "load()", 5, "Load"),
BadFailOnConstraint.create(Loads.class, "load()", 6, "Load"),
BadFailOnConstraint.create(Loads.class, "load()", 7, "Load"),
GoodRuleConstraint.create(Loads.class, "load()", 8),
GoodRuleConstraint.create(Loads.class, "load()", 9),
GoodRuleConstraint.create(Loads.class, "load()", 10),
BadFailOnConstraint.create(Loads.class, "loadKlass()", 1),
BadCountsConstraint.create(Loads.class, "loadKlass()", 2, 2,"Field")
);
// Loops
runCheck(BadFailOnConstraint.create(Loops.class, "loop()", 1, "Loop"),
GoodRuleConstraint.create(Loops.class, "loop()", 2),