reduce code duplication for getting the locals dict off a truffle frame

Author: timfel

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

@@ -95,7 +95,6 @@
 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.frame.FrameBuiltins.GetLocalsNode;
 import com.oracle.graal.python.builtins.objects.function.Arity;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -506,12 +505,7 @@ private static void inheritGlobals(Frame callerFrame, Object[] args) {
         }
 
         private void inheritLocals(Frame callerFrame, Object[] args, GetLocalsNode getLocalsNode) {
-            PFrame pFrame = PArguments.getPFrame(callerFrame);
-            if (pFrame == null) {
-                pFrame = factory().createPFrame(callerFrame);
-                PArguments.setPFrame(callerFrame, pFrame);
-            }
-            Object callerLocals = getLocalsNode.execute(pFrame);
+            Object callerLocals = getLocalsNode.execute(callerFrame);
             setCustomLocals(args, callerLocals);
         }
 
@@ -1653,21 +1647,11 @@ public Object globals(VirtualFrame frame) {
     abstract static class LocalsNode extends PythonBuiltinNode {
         @Child ReadCallerFrameNode readCallerFrameNode = ReadCallerFrameNode.create();
         @Child GetLocalsNode getLocalsNode = GetLocalsNode.create();
-        private final ConditionProfile hasFrame = ConditionProfile.createBinaryProfile();
-        private final ConditionProfile hasPFrame = ConditionProfile.createBinaryProfile();
 
         @Specialization
         public Object locals(VirtualFrame frame) {
             Frame callerFrame = readCallerFrameNode.executeWith(frame);
-            PFrame pFrame = PArguments.getPFrame(callerFrame);
-            if (hasPFrame.profile(pFrame == null)) {
-                pFrame = factory().createPFrame(callerFrame);
-                PArguments.setPFrame(callerFrame, pFrame);
-            } else if (hasFrame.profile(!pFrame.hasFrame())) {
-                pFrame = factory().createPFrame(callerFrame, pFrame.getLocalsDict());
-                PArguments.setPFrame(callerFrame, pFrame);
-            }
-            return getLocalsNode.execute(pFrame);
+            return getLocalsNode.execute(callerFrame);
         }
     }
 }

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

@@ -44,12 +44,15 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.subscript.SetItemNode;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PythonBuiltinClassType.PFrame)
 public final class FrameBuiltins extends PythonBuiltins {
@@ -157,6 +160,22 @@ Object get(PFrame self) {
             return locals;
         }
 
+        @Specialization
+        Object getFromFrame(Frame owner,
+                        @Cached("createBinaryProfile()") ConditionProfile noPFrame,
+                        @Cached("create()") BranchProfile noFrameOnPFrame) {
+            PFrame pFrame = PArguments.getPFrame(owner);
+            if (noPFrame.profile(pFrame == null)) {
+                pFrame = factory().createPFrame(owner);
+                PArguments.setPFrame(owner, pFrame);
+            } else if (!pFrame.hasFrame()) {
+                noFrameOnPFrame.enter();
+                pFrame = factory().createPFrame(owner, pFrame.getLocalsDict());
+                PArguments.setPFrame(owner, pFrame);
+            }
+            return get(pFrame);
+        }
+
         public static GetLocalsNode create() {
             return GetLocalsNodeFactory.create();
         }