Rename GetDictNode to GetDictFromGlobalsNode

Author: msimacek

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

@@ -48,6 +48,7 @@
 import com.oracle.graal.python.annotations.ArgumentClinic.ClinicConversion;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.WarningsModuleBuiltinsClinicProviders.WarnBuiltinNodeClinicProviderGen;
@@ -76,15 +77,15 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.nodes.object.GetDictNode;
+import com.oracle.graal.python.nodes.object.GetDictFromGlobalsNode;
+import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.statement.AbstractImportNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaIntLossyNode;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.formatting.ErrorMessageFormatter;
@@ -169,7 +170,8 @@ static final class WarningsModuleNode extends Node implements IndirectCallNode {
         @Child PyObjectIsTrueNode isTrueNode;
         @Child PythonObjectFactory factory;
         @Child IsSubtypeNode isSubtype;
-        @Child GetDictNode getDictNode;
+        @Child GetOrCreateDictNode getDictNode;
+        @Child GetDictFromGlobalsNode getDictFromGlobalsNode;
         @Child ReadCallerFrameNode readCallerNode;
 
         static WarningsModuleNode create() {
@@ -281,21 +283,18 @@ private PDict getSysDict() {
             if (getDictNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 reportPolymorphicSpecialize();
-                getDictNode = insert(GetDictNode.create());
+                getDictNode = insert(GetOrCreateDictNode.create());
             }
             return getDictNode.execute(getContext().getCore().lookupBuiltinModule("sys"));
         }
 
         private Object getGlobalsDict(Object globals) {
-            if (globals instanceof PDict) {
-                return globals;
-            }
-            if (getDictNode == null) {
+            if (getDictFromGlobalsNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 reportPolymorphicSpecialize();
-                getDictNode = insert(GetDictNode.create());
+                getDictFromGlobalsNode = insert(GetDictFromGlobalsNode.create());
             }
-            return getDictNode.execute(globals);
+            return getDictFromGlobalsNode.execute(globals);
         }
 
         private PFrame getCallerFrame(VirtualFrame frame, int stackLevel) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetDictNode.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetDictFromGlobalsNode.java

@@ -42,35 +42,32 @@
 
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
-import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
-import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 
-@ImportStatic(PGuards.class)
 @GenerateUncached
-public abstract class GetDictNode extends PNodeWithContext {
+public abstract class GetDictFromGlobalsNode extends PNodeWithContext {
 
-    public abstract PDict execute(Object o);
+    public abstract PDict execute(Object globals);
 
     @Specialization
-    PDict dict(PDict self) {
-        return self;
+    PDict dict(PDict globals) {
+        return globals;
     }
 
     @Specialization
-    PDict dict(PythonModule self,
+    PDict dict(PythonModule globals,
                     @Cached GetOrCreateDictNode getDict) {
-        return getDict.execute(self);
+        return getDict.execute(globals);
     }
 
-    public static GetDictNode create() {
-        return GetDictNodeGen.create();
+    public static GetDictFromGlobalsNode create() {
+        return GetDictFromGlobalsNodeGen.create();
     }
 
-    public static GetDictNode getUncached() {
-        return GetDictNodeGen.getUncached();
+    public static GetDictFromGlobalsNode getUncached() {
+        return GetDictFromGlobalsNodeGen.getUncached();
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java

@@ -62,7 +62,7 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.object.GetDictNode;
+import com.oracle.graal.python.nodes.object.GetDictFromGlobalsNode;
 import com.oracle.graal.python.nodes.statement.AbstractImportNodeFactory.ImportNameNodeGen;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
@@ -158,7 +158,7 @@ static Object importName(VirtualFrame frame, PythonContext context, PythonModule
                         @CachedLibrary("builtins") DynamicObjectLibrary builtinsDylib,
                         @Cached PConstructAndRaiseNode raiseNode,
                         @Cached CallNode importCallNode,
-                        @Cached GetDictNode getDictNode,
+                        @Cached GetDictFromGlobalsNode getDictNode,
                         @Cached PythonObjectFactory factory,
                         @Cached ImportModuleLevelObject importModuleLevel) {
             Object importFunc = builtinsDylib.getOrDefault(builtins, __IMPORT__, null);
@@ -397,7 +397,7 @@ abstract static class ResolveName extends Node {
 
         @Specialization
         String resolveName(VirtualFrame frame, String name, Object globals, int level,
-                        @Cached GetDictNode getDictNode,
+                        @Cached GetDictFromGlobalsNode getDictNode,
                         @Cached PyDictGetItem getPackageOrNameNode,
                         @Cached PyDictGetItem getSpecNode,
                         @Cached PyObjectGetAttr getParent,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportStarNode.java

@@ -44,7 +44,7 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
-import com.oracle.graal.python.nodes.object.GetDictNode;
+import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.subscript.GetItemNode;
 import com.oracle.graal.python.nodes.subscript.SetItemNode;
@@ -73,7 +73,7 @@ public class ImportStarNode extends AbstractImportNode {
     @Child private PyObjectSizeNode sizeNode;
     @Child private PythonObjectLibrary pol;
     @Child private PyObjectGetAttr getAllNode;
-    @Child private GetDictNode getDictNode;
+    @Child private GetOrCreateDictNode getDictNode;
 
     @Child private IsBuiltinClassProfile isAttributeErrorProfile;
     @Child private IsBuiltinClassProfile isStopIterationProfile;
@@ -239,10 +239,10 @@ private PythonObjectLibrary ensurePol() {
         return pol;
     }
 
-    private GetDictNode ensureGetDictNode() {
+    private GetOrCreateDictNode ensureGetDictNode() {
         if (getDictNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            getDictNode = insert(GetDictNode.create());
+            getDictNode = insert(GetOrCreateDictNode.create());
         }
         return getDictNode;
     }