intrinsify globals() and locals()

Author: timfel

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

@@ -96,6 +96,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.Arity;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
@@ -138,6 +139,7 @@
 import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
 import com.oracle.graal.python.nodes.expression.TernaryArithmetic;
 import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
+import com.oracle.graal.python.nodes.function.ClassBodyRootNode;
 import com.oracle.graal.python.nodes.function.FunctionRootNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -1587,4 +1589,46 @@ String inputPrompt(String prompt) {
             return input(null);
         }
     }
+
+    @Builtin(name = "globals", fixedNumOfPositionalArgs = 0)
+    @GenerateNodeFactory
+    abstract static class GlobalsNode extends PythonBuiltinNode {
+        @Child ReadCallerFrameNode readCallerFrameNode = ReadCallerFrameNode.create();
+        private final ConditionProfile condProfile = ConditionProfile.createBinaryProfile();
+
+        @Specialization
+        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);
+            } else {
+                return globals;
+            }
+        }
+    }
+
+    @Builtin(name = "locals", fixedNumOfPositionalArgs = 0)
+    @GenerateNodeFactory
+    abstract static class LocalsNode extends PythonBuiltinNode {
+        @Child ReadCallerFrameNode readCallerFrameNode = ReadCallerFrameNode.create();
+        private final ConditionProfile condProfile = ConditionProfile.createBinaryProfile();
+        private final ConditionProfile inClassProfile = ConditionProfile.createBinaryProfile();
+
+        @Specialization
+        public Object globals(VirtualFrame frame) {
+            Frame callerFrame = readCallerFrameNode.executeWith(frame);
+            PFrame pFrame = PArguments.getPFrame(frame);
+            if (condProfile.profile(pFrame != null)) {
+                return pFrame.getLocals(factory());
+            } else {
+                Object specialArgument = PArguments.getSpecialArgument(callerFrame);
+                if (inClassProfile.profile(specialArgument instanceof ClassBodyRootNode)) {
+                    return factory().createDictLocals(frame, true);
+                } else {
+                    return factory().createDictLocals(frame, false);
+                }
+            }
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/InvokeNode.java

@@ -42,6 +42,7 @@
 import com.oracle.graal.python.nodes.PRootNode;
 import com.oracle.graal.python.nodes.argument.ApplyKeywordsNode;
 import com.oracle.graal.python.nodes.argument.ArityCheckNode;
+import com.oracle.graal.python.nodes.function.ClassBodyRootNode;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -60,6 +61,7 @@
 abstract class AbstractInvokeNode extends Node {
 
     private final ConditionProfile needsFrameProfile = ConditionProfile.createBinaryProfile();
+    private final ConditionProfile isClassBodyProfile = ConditionProfile.createBinaryProfile();
 
     protected static boolean shouldInlineGenerators() {
         return PythonOptions.getOption(PythonLanguage.getContextRef().get(), PythonOptions.ForceInlineGeneratorCalls);
@@ -101,6 +103,13 @@ protected final MaterializedFrame getCallerFrame(VirtualFrame frame, CallTarget
         return null;
     }
 
+    protected final void optionallySetClassBodySpecial(Object[] arguments, CallTarget callTarget) {
+        RootNode rootNode = ((RootCallTarget) callTarget).getRootNode();
+        if (isClassBodyProfile.profile(rootNode instanceof ClassBodyRootNode)) {
+            PArguments.setSpecialArgument(arguments, rootNode);
+        }
+    }
+
     @TruffleBoundary
     protected static Arity getArity(PythonCallable callee) {
         if (callee instanceof PythonBuiltinClass) {
@@ -128,6 +137,7 @@ protected Object execute(VirtualFrame frame, PythonCallable callee, Object[] arg
         RootCallTarget callTarget = getCallTarget(callee);
         MaterializedFrame callerFrame = getCallerFrame(frame, callTarget);
         PArguments.setCallerFrame(arguments, callerFrame);
+        optionallySetClassBodySpecial(arguments, callTarget);
         Arity arity = getArity(callee);
         if (isBuiltin(callee)) {
             PArguments.setKeywordArguments(arguments, keywords);
@@ -175,6 +185,7 @@ protected Object doNoKeywords(VirtualFrame frame, PythonObject globals, PCell[]
         PArguments.setGlobals(arguments, globals);
         PArguments.setClosure(arguments, closure);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));
+        optionallySetClassBodySpecial(arguments, callNode.getCallTarget());
         arityCheck.execute(arity, arguments, keywords);
         return callNode.call(arguments);
     }
@@ -186,6 +197,7 @@ protected Object doWithKeywords(VirtualFrame frame, PythonObject globals, PCell[
         PArguments.setGlobals(combined, globals);
         PArguments.setClosure(combined, closure);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));
+        optionallySetClassBodySpecial(arguments, callNode.getCallTarget());
         arityCheck.execute(arity, combined, PArguments.getKeywordArguments(combined));
         return callNode.call(combined);
     }
@@ -195,6 +207,7 @@ protected Object doBuiltinWithKeywords(VirtualFrame frame, @SuppressWarnings("un
                     PKeyword[] keywords) {
         PArguments.setKeywordArguments(arguments, keywords);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));
+        optionallySetClassBodySpecial(arguments, callNode.getCallTarget());
         arityCheck.execute(arity, arguments, keywords);
         return callNode.call(arguments);
     }
@@ -236,6 +249,7 @@ protected Object doNoKeywords(VirtualFrame frame, Object[] arguments, PKeyword[]
         PArguments.setGlobals(arguments, globals);
         PArguments.setClosure(arguments, closure);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));
+        optionallySetClassBodySpecial(arguments, callNode.getCallTarget());
         arityCheck.execute(arity, arguments, keywords);
         return callNode.call(arguments);
     }
@@ -247,6 +261,7 @@ protected Object doWithKeywords(VirtualFrame frame, Object[] arguments, PKeyword
         PArguments.setGlobals(combined, globals);
         PArguments.setClosure(combined, closure);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));
+        optionallySetClassBodySpecial(arguments, callNode.getCallTarget());
         arityCheck.execute(arity, combined, PArguments.getKeywordArguments(combined));
         return callNode.call(combined);
     }
@@ -255,6 +270,7 @@ protected Object doWithKeywords(VirtualFrame frame, Object[] arguments, PKeyword
     protected Object doBuiltinWithKeywords(VirtualFrame frame, Object[] arguments, PKeyword[] keywords) {
         PArguments.setKeywordArguments(arguments, keywords);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));
+        optionallySetClassBodySpecial(arguments, callNode.getCallTarget());
         arityCheck.execute(arity, arguments, keywords);
         return callNode.call(arguments);
     }

graalpython/lib-graalpython/functions.py

@@ -68,29 +68,6 @@ def print_f(*objects, sep=" ", end="\n", file=None, flush=False):
 del make_print
 
 
-# We close over the globals to avoid leaking sys to the builtins scope
-def make_globals_function():
-    import sys
-
-    def globals_f():
-        return sys._getframe(1).f_globals
-    globals_f.__name__ = "globals"
-    return globals_f
-globals = __builtin__(make_globals_function())
-del make_globals_function
-
-
-def make_locals_function():
-    import sys
-
-    def locals_f():
-        return sys._getframe(1).f_locals
-    locals_f.__name__ = "locals"
-    return locals_f
-locals = __builtin__(make_locals_function())
-del make_locals_function
-
-
 @__builtin__
 def any(iterable):
     for i in iterable: