Use copyTo for syncing frame locals

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.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/util/PythonUtils.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;