Fix materialized local reads

Author: DSouzaM

truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreter.java

@@ -198,11 +198,9 @@ public static long bla(long a1, @Variadic Object[] a2) {
     static final class ThrowOperation {
         @Specialization
         public static Object perform(long value,
-                        // TODO passing the actual bci breaks compiler tests because of how we
-                        // instantiate a location node from the bci
-                        @SuppressWarnings("unused") @Bind("$location") BytecodeLocation bci,
-                        @Bind("$root") Node node) {
-            throw new TestException("fail", node, -1, value);
+                        @Bind("$root") Node node,
+                        @Bind("$bci") int bci) {
+            throw new TestException("fail", node, bci, value);
         }
     }
 
@@ -308,6 +306,14 @@ protected static boolean callTargetMatches(CallTarget left, CallTarget right) {
         }
     }
 
+    @Operation
+    public static final class MaterializeFrame {
+        @Specialization
+        public static MaterializedFrame materialize(VirtualFrame frame) {
+            return frame.materialize();
+        }
+    }
+
     @Operation
     public static final class CreateClosure {
         @Specialization

truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreterTest.java

@@ -510,6 +510,50 @@ public void testNestedFunctions() {
         assertEquals(1L, root.call());
     }
 
+    @Test
+    public void testMaterializedFrameAccesses() {
+        // x = 41
+        // f = materialize()
+        // f.x = f.x + 1
+        // return x
+
+        RootCallTarget root = parse("materializedFrameAccesses", b -> {
+            b.beginRoot(LANGUAGE);
+
+            BytecodeLocal x = b.createLocal();
+            BytecodeLocal f = b.createLocal();
+
+            b.beginStoreLocal(x);
+            b.emitLoadConstant(41L);
+            b.endStoreLocal();
+
+            b.beginStoreLocal(f);
+            b.emitMaterializeFrame();
+            b.endStoreLocal();
+
+            b.beginStoreLocalMaterialized(x);
+
+            b.emitLoadLocal(f);
+
+            b.beginAddOperation();
+            b.beginLoadLocalMaterialized(x);
+            b.emitLoadLocal(f);
+            b.endLoadLocalMaterialized();
+            b.emitLoadConstant(1L);
+            b.endAddOperation();
+
+            b.endStoreLocalMaterialized();
+
+            b.beginReturn();
+            b.emitLoadLocal(x);
+            b.endReturn();
+
+            b.endRoot();
+        });
+
+        assertEquals(42L, root.call());
+    }
+
     @Test
     @Ignore
     public void testLocalsNonlocalRead() {

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/generator/BytecodeDSLNodeFactory.java

@@ -7964,7 +7964,7 @@ private List<CodeExecutableElement> createContinueAt() {
                         b.statement("sp += 1");
                         break;
                     case LOAD_LOCAL_MATERIALIZED:
-                        String materializedFrame = "((VirtualFrame) " + getFrameObject("sp - 2)");
+                        String materializedFrame = "((VirtualFrame) " + getFrameObject("sp - 1)");
                         if (instr.isQuickening() || tier.isUncached() || !model.usesBoxingElimination()) {
                             b.startStatement();
                             b.startCall(lookupDoLoadLocal(instr).getSimpleName().toString());
@@ -9005,7 +9005,12 @@ private CodeExecutableElement lookupDoLoadLocal(InstructionModel instr) {
             }
 
             b.startStatement();
-            startSetFrame(b, inputType).string(needsStackFrame ? "stackFrame" : "frame").string("sp");
+            startSetFrame(b, inputType).string(needsStackFrame ? "stackFrame" : "frame");
+            if (instr.kind == InstructionKind.LOAD_LOCAL_MATERIALIZED) {
+                b.string("sp - 1"); // overwrite the materialized frame
+            } else {
+                b.string("sp");
+            }
             if (generic) {
                 startRequireFrame(b, slotType).string("frame").tree(readSlot).end();
             } else {
@@ -9125,7 +9130,13 @@ private CodeExecutableElement lookupDoSpecializeLoadLocal(InstructionModel instr
 
             emitQuickening(b, "$this", "bc", "bci", null, "newInstruction");
             b.startStatement();
-            startSetFrame(b, type(Object.class)).string(stackFrame).string("sp").string("value").end();
+            startSetFrame(b, type(Object.class)).string(stackFrame);
+            if (instr.kind == InstructionKind.LOAD_LOCAL_MATERIALIZED) {
+                b.string("sp - 1"); // overwrite the materialized frame
+            } else {
+                b.string("sp");
+            }
+            b.string("value").end();
             b.end();
 
             doInstructionMethods.put(instr, method);