set localsDict to the globals for Exec with globals argument

Author: timfel

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

@@ -627,6 +627,7 @@ PNone execDefault(Object source, PDict globals, @SuppressWarnings("unused") PNon
             PCode code = compileNode.execute(source, "exec", "exec", 0, false, -1);
             Object[] args = PArguments.create();
             PArguments.setGlobals(args, globals);
+            PArguments.setPFrame(args, factory().createPFrame(globals));
             // If locals are not given, they default to the globals, so we don't need the caller
             // frame's closure at all
             indirectCallNode.call(code.getRootCallTarget(), args);

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

@@ -76,6 +76,16 @@ public PFrame(LazyPythonClass cls, Frame frame) {
         this.inClassScope = PArguments.getSpecialArgument(frame) instanceof ClassBodyRootNode;
     }
 
+    public PFrame(LazyPythonClass cls, PDict locals) {
+        super(cls);
+        this.exception = null;
+        this.index = -1;
+        this.frame = null;
+        this.location = null;
+        this.inClassScope = false;
+        this.localsDict = locals;
+    }
+
     public PFrame(LazyPythonClass cls, PBaseException exception, int index) {
         super(cls);
         this.exception = exception;
@@ -151,8 +161,11 @@ public PDict getLocals(PythonObjectFactory factory) {
                 }
             }
             return localsDict;
+        } else if (localsDict != null) {
+            return localsDict;
+        } else {
+            return factory.createDict();
         }
-        return factory.createDict();
     }
 
     /**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PArguments.java

@@ -148,7 +148,11 @@ public static PythonObject getGlobalsSafe(Frame frame) {
     }
 
     public static void setPFrame(Frame frame, PFrame pFrame) {
-        ((PFrame[]) frame.getArguments()[INDEX_PFRAME_ARGUMENT])[0] = pFrame;
+        setPFrame(frame.getArguments(), pFrame);
+    }
+
+    public static void setPFrame(Object[] args, PFrame pFrame) {
+        ((PFrame[]) args[INDEX_PFRAME_ARGUMENT])[0] = pFrame;
     }
 
     public static PFrame getPFrame(Frame frame) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -560,6 +560,10 @@ public PReferenceType createReferenceType(PythonObject object, PFunction callbac
      * Frames, traces and exceptions
      */
 
+    public PFrame createPFrame(PDict locals) {
+        return trace(new PFrame(PythonBuiltinClassType.PFrame, locals));
+    }
+
     public PFrame createPFrame(Frame frame) {
         return trace(new PFrame(PythonBuiltinClassType.PFrame, frame));
     }