[GR-69321] Fix bad compilations with settrace

PullRequest: graalpython/3984

Author: msimacek

.github/workflows/downstream-tests.yml

@@ -34,7 +34,12 @@ jobs:
 
     - name: Install CMake (Darwin)
       if: ${{ matrix.os.platform == 'darwin' && matrix.name == 'pybind11' }}
-      run: brew install cmake
+      run: |
+        if brew list cmake >/dev/null 2>&1; then
+          echo "cmake already installed"
+        else
+          brew install cmake
+        fi
 
     - name: Install Rust toolchain
       if: ${{ matrix.name == 'pyo3' || matrix.name == 'pydantic-core' || matrix.name == 'jiter' }}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java

@@ -306,7 +306,9 @@ Object getUpdating(VirtualFrame frame, PFrame self,
                 PFrame pyFrame = materializeNode.executeOnStack(false, true, frame);
                 assert pyFrame == self;
             }
-            return getFrameLocalsNode.execute(inliningTarget, self);
+            Object locals = getFrameLocalsNode.execute(inliningTarget, self);
+            self.setLocalsAccessed(true);
+            return locals;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/PFrame.java

@@ -86,6 +86,7 @@ public final class PFrame extends PythonBuiltinObject {
     public static final int NO_JUMP = -2;
     private int jumpDestLine = DISALLOW_JUMPS;
     private Object localTraceFun = null;
+    private boolean localsAccessed;
 
     private boolean traceLine = true;
 
@@ -119,6 +120,14 @@ public void setJumpDestLine(int jumpDestLine) {
         this.jumpDestLine = jumpDestLine;
     }
 
+    public boolean localsAccessed() {
+        return localsAccessed;
+    }
+
+    public void setLocalsAccessed(boolean localsAccessed) {
+        this.localsAccessed = localsAccessed;
+    }
+
     // TODO: frames: this is a large object, think about how to make this
     // smaller
     public static final class Reference {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -55,6 +55,7 @@
 import com.oracle.graal.python.nodes.bytecode_dsl.PBytecodeDSLRootNode;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.object.PFactory;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.bytecode.BytecodeNode;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -206,7 +207,7 @@ private static void copyLocalsArray(Frame localFrame, PRootNode root, PDict loca
             BytecodeNode bytecodeNode = bytecodeDSLRootNode.getBytecodeNode();
             for (int i = 0; i < namesArray.length; i++) {
                 TruffleString varname = namesArray[i];
-                Object value = PyDictGetItem.executeUncached(localsDict, varname);
+                Object value = getDictItemUncached(localsDict, varname);
                 if (deref) {
                     PCell cell = (PCell) bytecodeNode.getLocalValue(0, localFrame, offset + i);
                     cell.setRef(value);
@@ -217,7 +218,7 @@ private static void copyLocalsArray(Frame localFrame, PRootNode root, PDict loca
         } else {
             for (int i = 0; i < namesArray.length; i++) {
                 TruffleString varname = namesArray[i];
-                Object value = PyDictGetItem.executeUncached(localsDict, varname);
+                Object value = getDictItemUncached(localsDict, varname);
                 if (deref) {
                     PCell cell = (PCell) localFrame.getObject(offset + i);
                     cell.setRef(value);
@@ -228,6 +229,11 @@ private static void copyLocalsArray(Frame localFrame, PRootNode root, PDict loca
         }
     }
 
+    @TruffleBoundary
+    private static Object getDictItemUncached(PDict localsDict, TruffleString varname) {
+        return PyDictGetItem.executeUncached(localsDict, varname);
+    }
+
     @NeverDefault
     public static GetFrameLocalsNode create() {
         return GetFrameLocalsNodeGen.create();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/GetFrameLocalsNode.java

@@ -236,10 +236,9 @@ public abstract static class SyncFrameValuesNode extends Node {
         public abstract void execute(PFrame pyFrame, Frame frameToSync);
 
         @Specialization(guards = {"!pyFrame.hasCustomLocals()",
-                        "frameToSync.getFrameDescriptor() == cachedFd",
-                        "variableSlotCount(cachedFd) < 32"}, limit = "1")
+                        "frameToSync.getFrameDescriptor() == cachedFd"}, limit = "1")
         @ExplodeLoop
-        static void doSyncExploded(PFrame pyFrame, Frame frameToSync,
+        static void doSyncCached(PFrame pyFrame, Frame frameToSync,
                         @Cached(value = "frameToSync.getFrameDescriptor()") FrameDescriptor cachedFd) {
             MaterializedFrame target = pyFrame.getLocals();
             assert cachedFd == target.getFrameDescriptor();
@@ -252,30 +251,14 @@ static void doSyncExploded(PFrame pyFrame, Frame frameToSync,
                     rootNode.getBytecodeNode().copyLocalValues(0, frameToSync, target, 0, slotCount);
                 }
             } else {
-                for (int i = 0; i < slotCount; i++) {
-                    PythonUtils.copyFrameSlot(frameToSync, target, i);
-                }
+                frameToSync.copyTo(0, target, 0, slotCount);
             }
         }
 
-        @Specialization(guards = "!pyFrame.hasCustomLocals()", replaces = "doSyncExploded")
+        @Specialization(guards = "!pyFrame.hasCustomLocals()", replaces = "doSyncCached")
         @ExplodeLoop
         static void doSync(PFrame pyFrame, Frame frameToSync) {
-            MaterializedFrame target = pyFrame.getLocals();
-            FrameDescriptor fd = target.getFrameDescriptor();
-            int slotCount = variableSlotCount(fd);
-
-            if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {
-                FrameInfo info = (FrameInfo) fd.getInfo();
-                if (info instanceof BytecodeDSLFrameInfo bytecodeDSLFrameInfo) {
-                    PBytecodeDSLRootNode rootNode = bytecodeDSLFrameInfo.getRootNode();
-                    rootNode.getBytecodeNode().copyLocalValues(0, frameToSync, target, 0, slotCount);
-                }
-            } else {
-                for (int i = 0; i < slotCount; i++) {
-                    PythonUtils.copyFrameSlot(frameToSync, target, i);
-                }
-            }
+            doSyncCached(pyFrame, frameToSync, frameToSync.getFrameDescriptor());
         }
 
         @Specialization(guards = "pyFrame.hasCustomLocals()")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java

@@ -92,8 +92,6 @@
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.dsl.GeneratedBy;
 import com.oracle.truffle.api.dsl.NodeFactory;
-import com.oracle.truffle.api.frame.Frame;
-import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.memory.ByteArraySupport;
@@ -742,24 +740,6 @@ public static Unsafe initUnsafe() {
         }
     }
 
-    public static void copyFrameSlot(Frame frameToSync, MaterializedFrame target, int slot) {
-        if (frameToSync.isObject(slot)) {
-            target.setObject(slot, frameToSync.getObject(slot));
-        } else if (frameToSync.isInt(slot)) {
-            target.setInt(slot, frameToSync.getInt(slot));
-        } else if (frameToSync.isLong(slot)) {
-            target.setLong(slot, frameToSync.getLong(slot));
-        } else if (frameToSync.isBoolean(slot)) {
-            target.setBoolean(slot, frameToSync.getBoolean(slot));
-        } else if (frameToSync.isDouble(slot)) {
-            target.setDouble(slot, frameToSync.getDouble(slot));
-        } else if (frameToSync.isFloat(slot)) {
-            target.setFloat(slot, frameToSync.getFloat(slot));
-        } else if (frameToSync.isByte(slot)) {
-            target.setByte(slot, frameToSync.getByte(slot));
-        }
-    }
-
     public static TruffleString[] objectArrayToTruffleStringArray(Node inliningTarget, Object[] array, CastToTruffleStringNode cast) {
         if (array.length == 0) {
             return EMPTY_TRUFFLESTRING_ARRAY;