Fix: BytecodeNode#setLocalValues should unwrap the frame from a continuation frame

Author: DSouzaM

truffle/src/com.oracle.truffle.api.bytecode.test/src/com/oracle/truffle/api/bytecode/test/LocalHelpersTest.java

@@ -1002,9 +1002,9 @@ public void testGetLocalsContinuationStacktrace() {
         CallTarget collectFrames = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
-                List<Object[]> frames = new ArrayList<>();
+                List<FrameInstance> frames = new ArrayList<>();
                 Truffle.getRuntime().iterateFrames(f -> {
-                    frames.add(BytecodeNode.getLocalValues(f));
+                    frames.add(f);
                     return null;
                 });
                 return frames;
@@ -1058,19 +1058,27 @@ public Object execute(VirtualFrame frame) {
         assertTrue(result instanceof List<?>);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> frames = (List<Object[]>) result;
+        List<FrameInstance> frames = (List<FrameInstance>) result;
         assertEquals(3, frames.size());
 
         // <anon>
-        assertNull(frames.get(0));
+        assertNull(BytecodeNode.getLocalValues(frames.get(0)));
 
         // bar
-        Object[] barLocals = frames.get(1);
+        Object[] barLocals = BytecodeNode.getLocalValues(frames.get(1));
         assertArrayEquals(new Object[]{42}, barLocals);
+        Object[] barLocalNames = BytecodeNode.getLocalNames(frames.get(1));
+        assertArrayEquals(new Object[]{"y"}, barLocalNames);
+        BytecodeNode.setLocalValues(frames.get(1), new Object[]{-42});
+        assertArrayEquals(new Object[]{-42}, BytecodeNode.getLocalValues(frames.get(1)));
 
         // foo
-        Object[] fooLocals = frames.get(2);
+        Object[] fooLocals = BytecodeNode.getLocalValues(frames.get(2));
         assertArrayEquals(new Object[]{123}, fooLocals);
+        Object[] fooLocalNames = BytecodeNode.getLocalNames(frames.get(2));
+        assertArrayEquals(new Object[]{"x"}, fooLocalNames);
+        BytecodeNode.setLocalValues(frames.get(2), new Object[]{456});
+        assertArrayEquals(new Object[]{456}, BytecodeNode.getLocalValues(frames.get(2)));
     }
 
     @Test

truffle/src/com.oracle.truffle.api.bytecode/src/com/oracle/truffle/api/bytecode/BytecodeNode.java

@@ -1226,7 +1226,7 @@ public static Object[] getLocalValues(FrameInstance frameInstance) {
         if (bytecode == null) {
             return null;
         }
-        Frame frame = resolveFrame(frameInstance);
+        Frame frame = resolveFrame(frameInstance, FrameAccess.READ_ONLY);
         int bci = bytecode.findBytecodeIndexImpl(frame, frameInstance.getCallNode());
         return bytecode.getLocalValues(bci, frame);
     }
@@ -1265,16 +1265,14 @@ public static boolean setLocalValues(FrameInstance frameInstance, Object[] value
             return false;
         }
         int bci = bytecode.findBytecodeIndex(frameInstance);
-        bytecode.setLocalValues(bci, frameInstance.getFrame(FrameAccess.READ_WRITE), values);
+        bytecode.setLocalValues(bci, resolveFrame(frameInstance, FrameAccess.READ_WRITE), values);
         return true;
     }
 
-    private static Frame resolveFrame(FrameInstance frameInstance) {
-        Frame frame = frameInstance.getFrame(FrameAccess.READ_ONLY);
-        if (frameInstance.getCallTarget() instanceof RootCallTarget root) {
-            if (root.getRootNode() instanceof ContinuationRootNode continuation) {
-                frame = continuation.findFrame(frame);
-            }
+    private static Frame resolveFrame(FrameInstance frameInstance, FrameAccess access) {
+        Frame frame = frameInstance.getFrame(access);
+        if (frameInstance.getCallTarget() instanceof RootCallTarget root && root.getRootNode() instanceof ContinuationRootNode continuation) {
+            frame = continuation.findFrame(frame);
         }
         return frame;
     }