fix rebase issues, disallow branches out of a finally handler

Author: DSouzaM

truffle/src/com.oracle.truffle.api.operation.test/src/com/oracle/truffle/api/operation/test/TestOperations.java

@@ -49,7 +49,6 @@
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateAOT;
-import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -63,12 +62,10 @@
 import com.oracle.truffle.api.operation.LocalSetter;
 import com.oracle.truffle.api.operation.LocalSetterRange;
 import com.oracle.truffle.api.operation.Operation;
-import com.oracle.truffle.api.operation.OperationProxy;
 import com.oracle.truffle.api.operation.OperationRootNode;
 import com.oracle.truffle.api.operation.ShortCircuitOperation;
 import com.oracle.truffle.api.operation.Variadic;
 import com.oracle.truffle.api.operation.test.GenerateOperationsTestVariants.Variant;
-import com.oracle.truffle.api.operation.tracing.TracingMetadata.SpecializationNames;
 
 @GenerateOperationsTestVariants({
                 @Variant(suffix = "Base", configuration = @GenerateOperations(languageClass = TestOperationsLanguage.class, enableYield = true, enableSerialization = true)),

truffle/src/com.oracle.truffle.api.operation.test/src/com/oracle/truffle/api/operation/test/TestOperationsFinallyTryTest.java

@@ -180,7 +180,9 @@ public void testFinallyTryBranchForwardOutOfHandler() {
         // lbl:
         // arg0.append(4);
 
-        RootCallTarget root = parse("finallyTryBranchForwardOutOfHandler", b -> {
+        thrown.expect(IllegalStateException.class);
+        thrown.expectMessage("Branches inside finally handlers can only target labels defined in the same handler.");
+        parse("finallyTryBranchForwardOutOfHandler", b -> {
             b.beginRoot(LANGUAGE);
             OperationLabel lbl = b.createLabel();
 
@@ -203,8 +205,6 @@ public void testFinallyTryBranchForwardOutOfHandler() {
 
             b.endRoot();
         });
-
-        testOrdering(false, root, 1L, 2L, 4L);
     }
 
     @Test
@@ -851,7 +851,9 @@ public void testFinallyTryBranchIntoOuterFinally() {
         //   return 0;
         // }
 
-        RootCallTarget root = parse("finallyTryBranchIntoOuterFinally", b -> {
+        thrown.expect(IllegalStateException.class);
+        thrown.expectMessage("Branches inside finally handlers can only target labels defined in the same handler.");
+        parse("finallyTryBranchIntoOuterFinally", b -> {
             b.beginRoot(LANGUAGE);
 
             b.beginFinallyTry();
@@ -887,8 +889,6 @@ public void testFinallyTryBranchIntoOuterFinally() {
             b.endFinallyTry();
             b.endRoot();
         });
-
-        testOrdering(false, root, 1L, 3L, 5L, 8L);
     }
 
     @Test
@@ -921,7 +921,9 @@ public void testFinallyTryBranchIntoOuterFinallyNestedInAnotherFinally() {
         //   return 0;
         // }
 
-        RootCallTarget root = parse("finallyTryBranchIntoOuterFinallyNestedInAnotherFinally", b -> {
+        thrown.expect(IllegalStateException.class);
+        thrown.expectMessage("Branches inside finally handlers can only target labels defined in the same handler.");
+        parse("finallyTryBranchIntoOuterFinallyNestedInAnotherFinally", b -> {
             b.beginRoot(LANGUAGE);
 
             b.beginFinallyTry(); // a
@@ -970,8 +972,6 @@ public void testFinallyTryBranchIntoOuterFinallyNestedInAnotherFinally() {
             b.endFinallyTry();
             b.endRoot();
         });
-
-        testOrdering(false, root, 1L, 3L, 5L, 6L, 8L, 11L);
     }
 
     @Test

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/operations/generator/OperationsNodeFactory.java

@@ -1657,6 +1657,7 @@ private CodeTypeElement create() {
             builder.add(createDoEmitLeaves());
             builder.add(createAllocateNode());
             builder.add(createInFinallyTryHandler());
+            builder.add(createGetFinallyTryHandlerSequenceNumber());
             if (model.enableSerialization) {
                 builder.add(createSerialize());
                 builder.add(createDeserialize());
@@ -2024,7 +2025,7 @@ private CodeExecutableElement createCreateBranchStackHeightMapping() {
             b.statement("HashMap<Integer, Integer> result = new HashMap<>()");
             b.startFor().string("OperationLabel lbl : unresolvedLabels.keySet()").end().startBlock();
             b.startFor().startGroup().type(bytecodeLocation.asType()).string(" site : unresolvedLabels.get(lbl)").end(2).startBlock();
-            b.statement("assert !result.containsKey(site)");
+            b.statement("assert !result.containsKey(site.bci)");
             b.statement("result.put(site.bci, site.sp)");
             b.end(2);
             b.startReturn().string("result").end();
@@ -2627,19 +2628,18 @@ private void buildEmitOperationInstruction(CodeTreeBuilder b, OperationModel ope
                     b.string("curStack");
                     b.end(2);
                     b.newLine();
-                    b.lineComment("We need to track branch targets inside finally handlers so that they can be adjusted each time the handler is emitted.");
-                    b.startIf().string("label.finallyTryOp != " + UNINIT).end().startBlock();
-                    // An earlier step has validated that the label is defined by an operation on
-                    // the stack. We should be able to find the defining FinallyTry context without
-                    // hitting an NPE.
-                    b.statement("FinallyTryContext ctx = finallyTryContext");
-                    b.startWhile().string("ctx.finallyTrySequenceNumber != label.finallyTryOp").end().startBlock();
-                    b.statement("ctx = ctx.parentContext");
+
+                    // Branches inside finally handlers can only be relative to the handler,
+                    // otherwise a finally handler emitted before a "return" could branch out of the
+                    // handler and circumvent the return.
+                    b.startIf().string("inFinallyTryHandler(finallyTryContext)").end().startBlock();
+
+                    b.startIf().string("label.finallyTryOp != finallyTryContext.finallyTrySequenceNumber").end().startBlock();
+                    buildThrowIllegalStateException(b, "\"Branches inside finally handlers can only target labels defined in the same handler.\"");
                     b.end();
 
-                    b.startIf().string("inFinallyTryHandler(ctx)").end().startBlock();
+                    b.lineComment("We need to track branch targets inside finally handlers so that they can be adjusted each time the handler is emitted.");
                     b.statement("finallyTryContext.finallyRelativeBranches.add(bci + 1)");
-                    b.end();
 
                     b.end();
                     yield new String[]{UNINIT};
@@ -3486,6 +3486,18 @@ private CodeExecutableElement createInFinallyTryHandler() {
             return ex;
         }
 
+        private CodeExecutableElement createGetFinallyTryHandlerSequenceNumber() {
+            CodeExecutableElement ex = new CodeExecutableElement(Set.of(PRIVATE), context.getType(int.class), "getFinallyTryHandlerSequenceNumber");
+            ex.addParameter(new CodeVariableElement(finallyTryContext.asType(), "context"));
+            CodeTreeBuilder b = ex.createBuilder();
+
+            b.startReturn();
+            b.string("inFinallyTryHandler(context) ? context.finallyTrySequenceNumber : -1");
+            b.end();
+
+            return ex;
+        }
+
         private static String writeBc(String index, String value) {
             return String.format("ACCESS.shortArrayWrite(bc, %s, %s)", index, value);
         }

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/operations/model/InstructionModel.java

@@ -49,7 +49,6 @@
 import com.oracle.truffle.dsl.processor.ProcessorContext;
 import com.oracle.truffle.dsl.processor.java.model.CodeTypeElement;
 import com.oracle.truffle.dsl.processor.model.NodeData;
-import com.oracle.truffle.dsl.processor.operations.model.InstructionModel.Signature;
 
 public class InstructionModel implements InfoDumpable {
     public enum InstructionKind {

truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/expression/SLFunctionLiteralNode.java

@@ -64,7 +64,7 @@
 @NodeChild("functionName")
 public abstract class SLFunctionLiteralNode extends SLExpressionNode {
 
-    @SuppressWarnings("unused")
+    @SuppressWarnings({"unused", "truffle-neverdefault"})
     @Specialization
     public static SLFunction perform(
                     TruffleString functionName,