changeset 34175:5737d346238e

8142387: Various JVMCI tests fail on unexpected exception Reviewed-by: iignatyev, twisti Contributed-by: Roland Schatz <roland.schatz@oracle.com>
author twisti
date Thu, 12 Nov 2015 13:30:35 +0100
parents 4db2fb26dc49
children c1b52e665b47 ee71c590a456
files hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java
diffstat 4 files changed, 30 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java	Wed Nov 11 16:32:17 2015 -1000
+++ b/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java	Thu Nov 12 13:30:35 2015 +0100
@@ -71,6 +71,12 @@
         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) {
         Register[] allRegs = arch.getAvailableValueRegisters();
         for (int i = 0; i < allRegs.length; i++) {
--- a/hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java	Wed Nov 11 16:32:17 2015 -1000
+++ b/hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java	Thu Nov 12 13:30:35 2015 +0100
@@ -25,7 +25,7 @@
  * @test
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @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;
@@ -82,21 +82,21 @@
 
     @Test(expected = JVMCIError.class)
     public void testInvalidAssumption() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.setAssumptions(new Assumption[]{new InvalidAssumption()});
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testInvalidAlignment() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.getDataSection().insertData(new Data(7, 1, DataBuilder.zero(1)));
         installCode(result);
     }
 
     @Test(expected = NullPointerException.class)
     public void testNullDataPatchInDataSection() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         Data data = new Data(1, 1, (buffer, patch) -> {
             patch.accept(null);
             buffer.put((byte) 0);
@@ -107,7 +107,7 @@
 
     @Test(expected = NullPointerException.class)
     public void testNullReferenceInDataSection() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         Data data = new Data(1, 1, (buffer, patch) -> {
             patch.accept(new DataPatch(buffer.position(), null));
             buffer.put((byte) 0);
@@ -118,7 +118,7 @@
 
     @Test(expected = JVMCIError.class)
     public void testInvalidDataSectionReference() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         DataSectionReference ref = result.getDataSection().insertData(new Data(1, 1, DataBuilder.zero(1)));
         Data data = new Data(1, 1, (buffer, patch) -> {
             patch.accept(new DataPatch(buffer.position(), ref));
@@ -130,7 +130,7 @@
 
     @Test(expected = JVMCIError.class)
     public void testInvalidNarrowMethodInDataSection() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         HotSpotConstant c = (HotSpotConstant) dummyMethod.getEncoding();
         Data data = new Data(4, 4, (buffer, patch) -> {
             patch.accept(new DataPatch(buffer.position(), new ConstantReference((VMConstant) c.compress())));
@@ -142,7 +142,7 @@
 
     @Test(expected = NullPointerException.class)
     public void testNullConstantInDataSection() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         Data data = new Data(1, 1, (buffer, patch) -> {
             patch.accept(new DataPatch(buffer.position(), new ConstantReference(null)));
         });
@@ -152,7 +152,7 @@
 
     @Test(expected = JVMCIError.class)
     public void testInvalidConstantInDataSection() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         Data data = new Data(1, 1, (buffer, patch) -> {
             patch.accept(new DataPatch(buffer.position(), new ConstantReference(new InvalidVMConstant())));
         });
@@ -162,35 +162,35 @@
 
     @Test(expected = NullPointerException.class)
     public void testNullReferenceInCode() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.recordDataPatch(0, null);
         installCode(result);
     }
 
     @Test(expected = NullPointerException.class)
     public void testNullConstantInCode() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.recordDataPatch(0, new ConstantReference(null));
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testInvalidConstantInCode() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.recordDataPatch(0, new ConstantReference(new InvalidVMConstant()));
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testInvalidReference() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.recordDataPatch(0, new InvalidReference());
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testOutOfBoundsDataSectionReference() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         DataSectionReference ref = new DataSectionReference();
         ref.setOffset(0x1000);
         result.recordDataPatch(0, ref);
@@ -199,42 +199,42 @@
 
     @Test(expected = JVMCIError.class)
     public void testInvalidMark() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.recordMark(0, new Object());
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testInvalidMarkInt() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.recordMark(0, -1);
         installCode(result);
     }
 
     @Test(expected = NullPointerException.class)
     public void testNullInfopoint() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.addInfopoint(null);
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testUnknownInfopointReason() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.addInfopoint(new Infopoint(0, null, InfopointReason.UNKNOWN));
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testInfopointMissingDebugInfo() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.addInfopoint(new Infopoint(0, null, InfopointReason.METHOD_START));
         installCode(result);
     }
 
     @Test(expected = JVMCIError.class)
     public void testSafepointMissingDebugInfo() {
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.addInfopoint(new Infopoint(0, null, InfopointReason.SAFEPOINT));
         installCode(result);
     }
--- a/hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java	Wed Nov 11 16:32:17 2015 -1000
+++ b/hotspot/test/compiler/jvmci/errors/TestInvalidDebugInfo.java	Thu Nov 12 13:30:35 2015 +0100
@@ -25,7 +25,7 @@
  * @test
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @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;
@@ -68,7 +68,7 @@
         DebugInfo info = new DebugInfo(frame, vobj);
         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));
         installCode(result);
     }
--- a/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java	Wed Nov 11 16:32:17 2015 -1000
+++ b/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java	Thu Nov 12 13:30:35 2015 +0100
@@ -25,7 +25,7 @@
  * @test
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @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;
@@ -61,7 +61,7 @@
         DebugInfo info = new DebugInfo(pos);
         info.setReferenceMap(refMap);
 
-        CompilationResult result = new CompilationResult();
+        CompilationResult result = createEmptyCompilationResult();
         result.addInfopoint(new Infopoint(0, info, InfopointReason.SAFEPOINT));
         installCode(result);
     }