Avoid syncing class freevars to frame locals

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/test_frame_tests.py

@@ -51,6 +51,7 @@ def test_lineno():
 def test_nested_lineno():
     def test_nested():
         return sys._getframe(0)
+
     f = test_nested()
     assert f.f_lineno == 53
 
@@ -67,9 +68,11 @@ def test_read_and_write_locals():
 
 def test_backref():
     a = 'test_backref'
+
     def foo():
         a = 'foo'
         return sys._getframe(0).f_back
+
     assert foo().f_locals['a'] == 'test_backref'
 
     def get_frame():
@@ -106,7 +109,7 @@ def foo(i):
             return stack
         else:
             # This recursive call will cause
-            return foo(i+1)
+            return foo(i + 1)
 
     def bar():
         return foo(0)
@@ -151,6 +154,15 @@ def foo():
 
     assert type(locals()['cell']).__name__ == 'cell'
 
+
+def test_locals_freevar_in_class():
+    x = 1
+
+    class Foo:
+        c = x
+        assert 'c' in locals()
+        assert 'x' not in locals()
+
 # GR-22089
 # def test_backref_from_traceback():
 #     def bar():

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

@@ -2971,7 +2971,7 @@ private void invokeTraceFunction(VirtualFrame virtualFrame, Object arg, PythonCo
             // Force locals dict sync, so that we can sync them back later
             GetFrameLocalsNode.getUncached().execute(pyFrame);
             Object result = CallTernaryMethodNode.getUncached().execute(null, traceFn, pyFrame, event.pythonName, nonNullArg);
-            syncLocalsBack(virtualFrame, pyFrame);
+            syncLocalsBackToFrame(virtualFrame, pyFrame);
             Object realResult = result == PNone.NONE ? null : result;
             pyFrame.setLocalTraceFun(realResult);
         } catch (Throwable e) {
@@ -2985,34 +2985,12 @@ private void invokeTraceFunction(VirtualFrame virtualFrame, Object arg, PythonCo
         }
     }
 
-    // PyFrame_LocalsToFast
-    private void syncLocalsBack(VirtualFrame virtualFrame, PFrame pyFrame) {
+    private void syncLocalsBackToFrame(VirtualFrame virtualFrame, PFrame pyFrame) {
         Frame localFrame = virtualFrame;
         if (co.isGeneratorOrCoroutine()) {
             localFrame = PArguments.getGeneratorFrame(virtualFrame);
         }
-        Object localsDict = pyFrame.getLocalsDict();
-        copyLocalsArray(localFrame, localsDict, varnames, 0, false);
-        copyLocalsArray(localFrame, localsDict, cellvars, celloffset, true);
-        copyLocalsArray(localFrame, localsDict, freevars, freeoffset, true);
-    }
-
-    private static void copyLocalsArray(Frame localFrame, Object localsDict, TruffleString[] namesArray, int offset, boolean deref) {
-        for (int i = 0; i < namesArray.length; i++) {
-            TruffleString varname = namesArray[i];
-            Object value = null;
-            try {
-                value = PyObjectGetItem.getUncached().execute(null, localsDict, varname);
-            } catch (AbstractTruffleException e) {
-                // CPython ignores all exceptions
-            }
-            if (deref) {
-                PCell cell = (PCell) localFrame.getObject(offset + i);
-                cell.setRef(value);
-            } else {
-                localFrame.setObject(offset + i, value);
-            }
-        }
+        GetFrameLocalsNode.syncLocalsBackToFrame(co, pyFrame, localFrame);
     }
 
     private void profileCEvent(VirtualFrame virtualFrame, Object callable, PythonContext.ProfileEvent event, MutableLoopData mutableData, boolean profilingEnabled) {
@@ -3054,7 +3032,7 @@ private void invokeProfileFunction(VirtualFrame virtualFrame, Object arg, Python
             // Force locals dict sync, so that we can sync them back later
             GetFrameLocalsNode.getUncached().execute(pyFrame);
             Object result = CallTernaryMethodNode.getUncached().execute(null, profileFun, pyFrame, event.name, arg == null ? PNone.NONE : arg);
-            syncLocalsBack(virtualFrame, pyFrame);
+            syncLocalsBackToFrame(virtualFrame, pyFrame);
             Object realResult = result == PNone.NONE ? null : result;
             pyFrame.setLocalTraceFun(realResult);
         } catch (Throwable e) {

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

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.compiler.CodeUnit;
 import com.oracle.graal.python.lib.PyDictDelItem;
+import com.oracle.graal.python.lib.PyDictGetItem;
 import com.oracle.graal.python.lib.PyDictSetItem;
 import com.oracle.graal.python.nodes.bytecode.FrameInfo;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
@@ -55,6 +56,7 @@
 import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
@@ -143,6 +145,31 @@ protected static FrameInfo getInfo(FrameDescriptor fd) {
         }
     }
 
+    /**
+     * Equivalent of CPython's {@code PyFrame_LocalsToFast}
+     */
+    public static void syncLocalsBackToFrame(CodeUnit co, PFrame pyFrame, Frame localFrame) {
+        if (!pyFrame.hasCustomLocals()) {
+            PDict localsDict = (PDict) pyFrame.getLocalsDict();
+            copyLocalsArray(localFrame, localsDict, co.varnames, 0, false);
+            copyLocalsArray(localFrame, localsDict, co.cellvars, co.varnames.length, true);
+            copyLocalsArray(localFrame, localsDict, co.freevars, co.varnames.length + co.cellvars.length, true);
+        }
+    }
+
+    private static void copyLocalsArray(Frame localFrame, PDict localsDict, TruffleString[] namesArray, int offset, boolean deref) {
+        for (int i = 0; i < namesArray.length; i++) {
+            TruffleString varname = namesArray[i];
+            Object value = PyDictGetItem.getUncached().execute(null, localsDict, varname);
+            if (deref) {
+                PCell cell = (PCell) localFrame.getObject(offset + i);
+                cell.setRef(value);
+            } else {
+                localFrame.setObject(offset + i, value);
+            }
+        }
+    }
+
     @NeverDefault
     public static GetFrameLocalsNode create() {
         return GetFrameLocalsNodeGen.create();