test/compiler/jvmci/errors/TestInvalidCompilationResult.java

rev 9327 : 8142387: Various JVMCI tests fail on unexpected exception
rev 9280 : 8139589: [JVMCI] throw exceptions in faulty code installation operations
Reviewed-by: twisti
Contributed-by: Roland Schatz <roland.schatz@oracle.com>

@@ -23,11 +23,11 @@
 
 /**
  * @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;
 
 import static jdk.vm.ci.code.CompilationResult.ConstantReference;

@@ -80,47 +80,47 @@
         }
     }
 
     @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);
         });
         result.getDataSection().insertData(data);
         installCode(result);
     }
 
     @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);
         });
         result.getDataSection().insertData(data);
         installCode(result);
     }
 
     @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));
             buffer.put((byte) 0);
         });

@@ -128,11 +128,11 @@
         installCode(result);
     }
 
     @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())));
             buffer.putInt(0);
         });

@@ -140,102 +140,102 @@
         installCode(result);
     }
 
     @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)));
         });
         result.getDataSection().insertData(data);
         installCode(result);
     }
 
     @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())));
         });
         result.getDataSection().insertData(data);
         installCode(result);
     }
 
     @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);
         installCode(result);
     }
 
     @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);
     }
 }