Compiler tests: remove todo comment and update tests to new TryCatch API

Author: DSouzaM

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeDSLCompilationTest.java

@@ -27,6 +27,7 @@
 import static com.oracle.truffle.api.bytecode.test.basic_interpreter.AbstractBasicInterpreterTest.parseNode;
 import static com.oracle.truffle.api.bytecode.test.basic_interpreter.AbstractBasicInterpreterTest.invokeNewConfigBuilder;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.List;
 
@@ -60,11 +61,15 @@ public static List<Class<? extends BasicInterpreter>> getInterpreterClasses() {
     @Override
     public void before() {
         super.before();
-        // TODO without eager loading, the first compilation on some tests fails because this type
-        // is not loaded
+        /**
+         * Note: we force load the EarlyReturnException class because compilation bails out when it
+         * hasn't been loaded (the {@code interceptControlFlowException} method references it
+         * directly).
+         */
         try {
             Class.forName(BasicInterpreter.EarlyReturnException.class.getName());
         } catch (ClassNotFoundException ex) {
+            fail("should not have failed to load EarlyReturnException class");
         }
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeDSLPartialEvaluationTest.java

@@ -203,9 +203,7 @@ public void testTryCatch() {
         BasicInterpreter root = parseNodeForPE(interpreterClass, "sum", b -> {
             b.beginRoot(LANGUAGE);
 
-            BytecodeLocal ex = b.createLocal();
-
-            b.beginTryCatch(ex);
+            b.beginTryCatch();
 
             b.beginThrowOperation();
             b.emitLoadConstant(1L);
@@ -215,7 +213,7 @@ public void testTryCatch() {
             b.beginAddOperation();
 
             b.beginReadExceptionOperation();
-            b.emitLoadLocal(ex);
+            b.emitLoadException();
             b.endReadExceptionOperation();
 
             b.emitLoadConstant(1L);
@@ -253,11 +251,9 @@ public void testTryCatch2() {
         BasicInterpreter root = parseNodeForPE(interpreterClass, "sum", b -> {
             b.beginRoot(LANGUAGE);
 
-            BytecodeLocal ex = b.createLocal();
-
-            b.beginTryCatch(ex);
+            b.beginTryCatch();
 
-            b.beginTryCatch(ex);
+            b.beginTryCatch();
 
             b.beginThrowOperation();
             b.emitLoadConstant(1L);
@@ -266,7 +262,7 @@ public void testTryCatch2() {
             b.beginThrowOperation();
             b.beginAddOperation();
             b.beginReadExceptionOperation();
-            b.emitLoadLocal(ex);
+            b.emitLoadException();
             b.endReadExceptionOperation();
             b.emitLoadConstant(1L);
             b.endAddOperation();
@@ -278,7 +274,7 @@ public void testTryCatch2() {
             b.beginAddOperation();
 
             b.beginReadExceptionOperation();
-            b.emitLoadLocal(ex);
+            b.emitLoadException();
             b.endReadExceptionOperation();
 
             b.emitLoadConstant(1L);