archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8142387: Various JVMCI tests fail on unexpected exception

Browse source 
Reviewed-by: iignatyev, twisti
This commit is contained in:
Roland Schatz 2015-11-12 13:30:35 +01:00 • committed by Christian Thalinger
parent 6896030b96
commit eee22b283d
4 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java
View file

@ -71,6 +71,12 @@ public class CodeInstallerTest {
codeCache.addCode(dummyMethod, result, null, null); codeCache.addCode(dummyMethod, result, null, null);
} }
protected CompilationResult createEmptyCompilationResult() {
CompilationResult ret = new CompilationResult();
ret.setTotalFrameSize(0);
return ret;
}
protected Register getRegister(PlatformKind kind, int index) { protected Register getRegister(PlatformKind kind, int index) {
Register[] allRegs = arch.getAvailableValueRegisters(); Register[] allRegs = arch.getAvailableValueRegisters();
for (int i = 0; i < allRegs.length; i++) { for (int i = 0; i < allRegs.length; i++) {

40
hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java
View file

@ -25,7 +25,7 @@
* @test * @test
* @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64" * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
* @compile CodeInstallerTest.java * @compile CodeInstallerTest.java
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidCompilationResult * @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidCompilationResult
*/ */
package compiler.jvmci.errors; package compiler.jvmci.errors;
@ -82,21 +82,21 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidAssumption() { public void testInvalidAssumption() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.setAssumptions(new Assumption[]{new InvalidAssumption()}); result.setAssumptions(new Assumption[]{new InvalidAssumption()});
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidAlignment() { public void testInvalidAlignment() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.getDataSection().insertData(new Data(7, 1, DataBuilder.zero(1))); result.getDataSection().insertData(new Data(7, 1, DataBuilder.zero(1)));
installCode(result); installCode(result);
} }
@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
public void testNullDataPatchInDataSection() { public void testNullDataPatchInDataSection() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
Data data = new Data(1, 1, (buffer, patch) -> { Data data = new Data(1, 1, (buffer, patch) -> {
patch.accept(null); patch.accept(null);
buffer.put((byte) 0); buffer.put((byte) 0);
@ -107,7 +107,7 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
public void testNullReferenceInDataSection() { public void testNullReferenceInDataSection() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
Data data = new Data(1, 1, (buffer, patch) -> { Data data = new Data(1, 1, (buffer, patch) -> {
patch.accept(new DataPatch(buffer.position(), null)); patch.accept(new DataPatch(buffer.position(), null));
buffer.put((byte) 0); buffer.put((byte) 0);
@ -118,7 +118,7 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidDataSectionReference() { public void testInvalidDataSectionReference() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
DataSectionReference ref = result.getDataSection().insertData(new Data(1, 1, DataBuilder.zero(1))); DataSectionReference ref = result.getDataSection().insertData(new Data(1, 1, DataBuilder.zero(1)));
Data data = new Data(1, 1, (buffer, patch) -> { Data data = new Data(1, 1, (buffer, patch) -> {
patch.accept(new DataPatch(buffer.position(), ref)); patch.accept(new DataPatch(buffer.position(), ref));
@ -130,7 +130,7 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidNarrowMethodInDataSection() { public void testInvalidNarrowMethodInDataSection() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
HotSpotConstant c = (HotSpotConstant) dummyMethod.getEncoding(); HotSpotConstant c = (HotSpotConstant) dummyMethod.getEncoding();
Data data = new Data(4, 4, (buffer, patch) -> { Data data = new Data(4, 4, (buffer, patch) -> {
patch.accept(new DataPatch(buffer.position(), new ConstantReference((VMConstant) c.compress()))); patch.accept(new DataPatch(buffer.position(), new ConstantReference((VMConstant) c.compress())));
@ -142,7 +142,7 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
public void testNullConstantInDataSection() { public void testNullConstantInDataSection() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
Data data = new Data(1, 1, (buffer, patch) -> { Data data = new Data(1, 1, (buffer, patch) -> {
patch.accept(new DataPatch(buffer.position(), new ConstantReference(null))); patch.accept(new DataPatch(buffer.position(), new ConstantReference(null)));
}); });
@ -152,7 +152,7 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidConstantInDataSection() { public void testInvalidConstantInDataSection() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
Data data = new Data(1, 1, (buffer, patch) -> { Data data = new Data(1, 1, (buffer, patch) -> {
patch.accept(new DataPatch(buffer.position(), new ConstantReference(new InvalidVMConstant()))); patch.accept(new DataPatch(buffer.position(), new ConstantReference(new InvalidVMConstant())));
}); });
@ -162,35 +162,35 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
public void testNullReferenceInCode() { public void testNullReferenceInCode() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.recordDataPatch(0, null); result.recordDataPatch(0, null);
installCode(result); installCode(result);
} }
@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
public void testNullConstantInCode() { public void testNullConstantInCode() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.recordDataPatch(0, new ConstantReference(null)); result.recordDataPatch(0, new ConstantReference(null));
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidConstantInCode() { public void testInvalidConstantInCode() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.recordDataPatch(0, new ConstantReference(new InvalidVMConstant())); result.recordDataPatch(0, new ConstantReference(new InvalidVMConstant()));
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidReference() { public void testInvalidReference() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.recordDataPatch(0, new InvalidReference()); result.recordDataPatch(0, new InvalidReference());
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testOutOfBoundsDataSectionReference() { public void testOutOfBoundsDataSectionReference() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
DataSectionReference ref = new DataSectionReference(); DataSectionReference ref = new DataSectionReference();
ref.setOffset(0x1000); ref.setOffset(0x1000);
result.recordDataPatch(0, ref); result.recordDataPatch(0, ref);
@ -199,42 +199,42 @@ public class TestInvalidCompilationResult extends CodeInstallerTest {
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidMark() { public void testInvalidMark() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.recordMark(0, new Object()); result.recordMark(0, new Object());
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInvalidMarkInt() { public void testInvalidMarkInt() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.recordMark(0, -1); result.recordMark(0, -1);
installCode(result); installCode(result);
} }
@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
public void testNullInfopoint() { public void testNullInfopoint() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.addInfopoint(null); result.addInfopoint(null);
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testUnknownInfopointReason() { public void testUnknownInfopointReason() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.addInfopoint(new Infopoint(0, null, InfopointReason.UNKNOWN)); result.addInfopoint(new Infopoint(0, null, InfopointReason.UNKNOWN));
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testInfopointMissingDebugInfo() { public void testInfopointMissingDebugInfo() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.addInfopoint(new Infopoint(0, null, InfopointReason.METHOD_START)); result.addInfopoint(new Infopoint(0, null, InfopointReason.METHOD_START));
installCode(result); installCode(result);
} }
@Test(expected = JVMCIError.class) @Test(expected = JVMCIError.class)
public void testSafepointMissingDebugInfo() { public void testSafepointMissingDebugInfo() {
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.addInfopoint(new Infopoint(0, null, InfopointReason.SAFEPOINT)); result.addInfopoint(new Infopoint(0, null, InfopointReason.SAFEPOINT));
installCode(result); installCode(result);
} }

4
hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java
View file

@ -25,7 +25,7 @@
* @test * @test
* @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64" * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
* @compile CodeInstallerTest.java * @compile CodeInstallerTest.java
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidDebugInfo * @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidDebugInfo
*/ */
package compiler.jvmci.errors; package compiler.jvmci.errors;
@ -68,7 +68,7 @@ public class TestInvalidDebugInfo extends CodeInstallerTest {
DebugInfo info = new DebugInfo(frame, vobj); DebugInfo info = new DebugInfo(frame, vobj);
info.setReferenceMap(new HotSpotReferenceMap(new Location[0], new Location[0], new int[0], 8)); info.setReferenceMap(new HotSpotReferenceMap(new Location[0], new Location[0], new int[0], 8));
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.addInfopoint(new Infopoint(0, info, InfopointReason.SAFEPOINT)); result.addInfopoint(new Infopoint(0, info, InfopointReason.SAFEPOINT));
installCode(result); installCode(result);
} }

4
hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java
View file

@ -25,7 +25,7 @@
* @test * @test
* @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64" * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
* @compile CodeInstallerTest.java * @compile CodeInstallerTest.java
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidOopMap * @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidOopMap
*/ */
package compiler.jvmci.errors; package compiler.jvmci.errors;
@ -61,7 +61,7 @@ public class TestInvalidOopMap extends CodeInstallerTest {
DebugInfo info = new DebugInfo(pos); DebugInfo info = new DebugInfo(pos);
info.setReferenceMap(refMap); info.setReferenceMap(refMap);
CompilationResult result = new CompilationResult(); CompilationResult result = createEmptyCompilationResult();
result.addInfopoint(new Infopoint(0, info, InfopointReason.SAFEPOINT)); result.addInfopoint(new Infopoint(0, info, InfopointReason.SAFEPOINT));
installCode(result); installCode(result);
} }