make sure that locals are globals in the main execution context

Author: timfel

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

@@ -298,3 +298,6 @@ def f(a):
             assert locals()["x"] == 12\n""", None, m)
         assert eval("locals() is m", None, m)
         assert m["x"] == 12
+
+    def test_locals_is_globals(self):
+        exec("assert locals() is globals()", globals())

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -1645,7 +1645,12 @@ public Object globals(VirtualFrame frame) {
             Frame callerFrame = readCallerFrameNode.executeWith(frame);
             PythonObject globals = PArguments.getGlobals(callerFrame);
             if (condProfile.profile(globals instanceof PythonModule)) {
-                return factory().createDictFixedStorage(globals);
+                PHashingCollection dict = globals.getDict();
+                if (dict == null) {
+                    CompilerDirectives.transferToInterpreter();
+                    globals.setDict(dict = factory().createDictFixedStorage(globals));
+                }
+                return dict;
             } else {
                 return globals;
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java

@@ -47,6 +47,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
@@ -212,11 +213,16 @@ private static void printStackTrace(Exception e) {
 
     private Object run(VirtualFrame frame) {
         Object[] arguments = createArgs.execute(frame.getArguments());
+        PythonContext pythonContext = context.get();
         if (getSourceSection().getSource().isInternal()) {
             // internal sources are not run in the main module
-            PArguments.setGlobals(arguments, context.get().getCore().factory().createDict());
+            PArguments.setGlobals(arguments, pythonContext.getCore().factory().createDict());
         } else {
-            PArguments.setGlobals(arguments, context.get().getMainModule());
+            PythonModule mainModule = pythonContext.getMainModule();
+            PHashingCollection mainDict = mainModule.getDict();
+            PArguments.setGlobals(arguments, mainModule);
+            PArguments.setSpecialArgument(arguments, mainDict);
+            PArguments.setPFrame(arguments, pythonContext.getCore().factory().createPFrame(mainDict));
         }
         return innerCallTarget.call(arguments);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -231,6 +231,7 @@ private void setupRuntimeInformation() {
         builtinsModule = (PythonModule) sysModules.getItem("builtins");
         mainModule = core.factory().createPythonModule(__MAIN__);
         mainModule.setAttribute(__BUILTINS__, builtinsModule);
+        mainModule.setDict(core.factory().createDictFixedStorage(mainModule));
         sysModules.setItem(__MAIN__, mainModule);
         OpaqueBytes.initializeForNewContext(this);
         currentException = null;