[GR-28698] Various smaller fixes and cleanups.

lukasstadler · lukasstadler · commit 1d8d1a420f44 · 2021-02-23T12:12:14.000Z
PullRequest: graalpython/1631
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java
@@ -150,7 +150,7 @@ protected Source doBytesLike(Object pattern, String flags,
     abstract static class TRegexCallCompile extends PythonTernaryBuiltinNode {
 
         @Specialization
-        Object call(Object pattern, Object flags, PFunction fallbackCompiler,
+        Object call(VirtualFrame frame, Object pattern, Object flags, PFunction fallbackCompiler,
                         @Cached BranchProfile potentialSyntaxError,
                         @Cached BranchProfile syntaxError,
                         @Cached BranchProfile unsupportedRegexError,
@@ -167,7 +167,7 @@ Object call(Object pattern, Object flags, PFunction fallbackCompiler,
                 if (compiledRegexLib.isNull(compiledRegex)) {
                     unsupportedRegexError.enter();
                     if (context.getLanguage().getEngineOption(PythonOptions.TRegexUsesSREFallback)) {
-                        return callFallbackCompilerNode.execute(fallbackCompiler, pattern, flags);
+                        return callFallbackCompilerNode.execute(frame, fallbackCompiler, pattern, flags);
                     } else {
                         throw raise(ValueError, "regular expression not supported, no fallback engine present");
                     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java
@@ -898,7 +898,7 @@ public static Object lookupAttributeImpl(VirtualFrame frame, Object receiver, St
             try {
                 Object getAttrFunc = lookup.execute(receiver, __GETATTRIBUTE__);
                 try {
-                    return callNode.execute(getAttrFunc, receiver, name);
+                    return callNode.execute(frame, getAttrFunc, receiver, name);
                 } catch (PException pe) {
                     pe.expect(AttributeError, isAttrErrorProfile1);
                     getAttrFunc = lookup.execute(receiver, __GETATTR__);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/ModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/ModuleBuiltins.java
@@ -159,7 +159,7 @@ Object dir(VirtualFrame frame, PythonModule self,
                 HashingStorage dictStorage = getDictStorageNode.execute((PHashingCollection) dict);
                 Object dirFunc = hashLib.getItem(dictStorage, __DIR__);
                 if (dirFunc != null) {
-                    return callNode.execute(dirFunc);
+                    return callNode.execute(frame, dirFunc);
                 } else {
                     return constructListNode.execute(dict);
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java
@@ -42,6 +42,7 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -92,24 +93,31 @@ public void setLazyPythonClass(Object cls,
 
     @ExportMessage
     public static class GetLazyPythonClass {
-        public static boolean hasInitialClass(PythonObject self, DynamicObjectLibrary dylib) {
-            return (dylib.getShapeFlags(self) & CLASS_CHANGED_FLAG) == 0;
+        public static boolean hasInitialClass(Shape shape) {
+            return (shape.getFlags() & CLASS_CHANGED_FLAG) == 0;
         }
 
         public static Object getInitialClass(PythonObject self) {
             return self.initialPythonClass;
         }
 
         @SuppressWarnings("unused")
-        @Specialization(guards = {"klass != null", "self.getShape() == cachedShape", "hasInitialClass(self, dylib)"}, limit = "1", assumptions = "singleContextAssumption()")
+        @Specialization(guards = {"klass != null", "self.getShape() == cachedShape", "hasInitialClass(cachedShape)"}, limit = "1", assumptions = "singleContextAssumption()")
         public static Object getConstantClass(PythonObject self,
-                        @Shared("dylib") @CachedLibrary(limit = "4") DynamicObjectLibrary dylib,
                         @Cached("self.getShape()") Shape cachedShape,
                         @Cached(value = "getInitialClass(self)", weak = true) Object klass) {
             return klass;
         }
 
-        @Specialization(replaces = "getConstantClass")
+        @SuppressWarnings("unused")
+        @Specialization(guards = "hasInitialClass(self.getShape())")
+        public static Object getClass(PythonObject self,
+                        @Bind("getInitialClass(self)") Object klass) {
+            assert klass != null;
+            return klass;
+        }
+
+        @Specialization(guards = "!hasInitialClass(self.getShape())", replaces = "getConstantClass")
         public static Object getPythonClass(PythonObject self,
                         @Shared("dylib") @CachedLibrary(limit = "4") DynamicObjectLibrary dylib) {
             return dylib.getOrDefault(self, CLASS, self.initialPythonClass);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/SetNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/SetNodes.java
@@ -60,13 +60,11 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
-import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 
-@GenerateNodeFactory
 public abstract class SetNodes {
 
     @ImportStatic({PGuards.class, SpecialMethodNames.class, PythonOptions.class})
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java
@@ -70,7 +70,7 @@
 import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.function.ClassBodyRootNode;
 import com.oracle.graal.python.nodes.function.FunctionRootNode;
-import com.oracle.graal.python.nodes.generator.DictConcatNodeFactory;
+import com.oracle.graal.python.nodes.generator.DictConcatNodeGen;
 import com.oracle.graal.python.nodes.generator.YieldFromNode;
 import com.oracle.graal.python.nodes.generator.YieldNode;
 import com.oracle.graal.python.nodes.literal.BooleanLiteralNode;
@@ -85,7 +85,7 @@
 import com.oracle.graal.python.nodes.literal.LongLiteralNode;
 import com.oracle.graal.python.nodes.literal.ObjectLiteralNode;
 import com.oracle.graal.python.nodes.literal.PIntLiteralNode;
-import com.oracle.graal.python.nodes.literal.SetLiteralNodeFactory;
+import com.oracle.graal.python.nodes.literal.SetLiteralNodeGen;
 import com.oracle.graal.python.nodes.literal.StringLiteralNode;
 import com.oracle.graal.python.nodes.literal.TupleLiteralNode;
 import com.oracle.graal.python.nodes.statement.AssertNode;
@@ -279,11 +279,11 @@ public ExpressionNode createListLiteral(ExpressionNode[] values) {
 
     public ExpressionNode createSetLiteral(List<ExpressionNode> values) {
         ExpressionNode[] convertedValues = values.toArray(new ExpressionNode[values.size()]);
-        return SetLiteralNodeFactory.create(convertedValues);
+        return SetLiteralNodeGen.create(convertedValues);
     }
 
     public ExpressionNode createSetLiteral(ExpressionNode[] values) {
-        return SetLiteralNodeFactory.create(values);
+        return SetLiteralNodeGen.create(values);
     }
 
     public ExpressionNode createUnaryOperation(String string, ExpressionNode operand) {
@@ -520,7 +520,7 @@ public StatementNode createWithNode(ExpressionNode withContext, WriteNode target
     }
 
     public ExpressionNode createDictionaryConcat(ExpressionNode... dictNodes) {
-        return DictConcatNodeFactory.create(dictNodes);
+        return DictConcatNodeGen.create(dictNodes);
     }
 
     public ExpressionNode callBuiltin(String string, ExpressionNode argument) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/TupleNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/TupleNodes.java
@@ -53,13 +53,11 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
-import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 
-@GenerateNodeFactory
 public abstract class TupleNodes {
 
     @ImportStatic({PGuards.class, SpecialMethodNames.class})
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectGetBasesNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/AbstractObjectGetBasesNode.java
@@ -74,10 +74,6 @@ public final PTuple execute(VirtualFrame frame, Object cls) {
         return executeInternal(frame, cls);
     }
 
-    public final PTuple execute(Object cls) {
-        return executeInternal(null, cls);
-    }
-
     @Specialization(guards = "!isUncached()")
     PTuple getBasesCached(VirtualFrame frame, Object cls,
                     @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode getAttributeNode,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/MaterializeFrameNode.java
@@ -76,6 +76,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.profiles.ValueProfile;
 
 /**
  * This node makes sure that the current frame has a filled-in PFrame object with a backref
@@ -317,16 +318,17 @@ public SyncFrameValuesNode(boolean adoptable) {
 
         public abstract void execute(VirtualFrame frame, PFrame pyframe, Frame frameToSync);
 
-        @Specialization(guards = {"hasLocalsStorage(pyFrame, frameToSync)", "frameToSync.getFrameDescriptor() == cachedFd", "cachedSlots.length < 32"}, //
+        @Specialization(guards = {"hasLocalsStorage(pyFrame, frameToSync, frameProfile)", "frameToSync.getFrameDescriptor() == cachedFd", "cachedSlots.length < 32"}, //
                         assumptions = "cachedFd.getVersion()", //
                         limit = "1")
         @ExplodeLoop
         static void doLocalsStorageCached(PFrame pyFrame, Frame frameToSync,
+                        @Cached("createClassProfile()") ValueProfile frameProfile,
                         @Cached("frameToSync.getFrameDescriptor()") FrameDescriptor cachedFd,
                         @Cached(value = "getSlots(cachedFd)", dimensions = 1) FrameSlot[] cachedSlots) {
             boolean invalidState = false;
             LocalsStorage localsStorage = getLocalsStorage(pyFrame);
-            MaterializedFrame target = localsStorage.getFrame();
+            MaterializedFrame target = frameProfile.profile(localsStorage.getFrame());
             assert cachedFd == target.getFrameDescriptor();
 
             for (int i = 0; i < cachedSlots.length; i++) {
@@ -390,15 +392,16 @@ static void doLocalsStorageCached(PFrame pyFrame, Frame frameToSync,
             }
         }
 
-        @Specialization(guards = {"hasLocalsStorage(pyFrame, frameToSync)", "frameToSync.getFrameDescriptor() == cachedFd"}, //
+        @Specialization(guards = {"hasLocalsStorage(pyFrame, frameToSync, frameProfile)", "frameToSync.getFrameDescriptor() == cachedFd"}, //
                         assumptions = "cachedFd.getVersion()", //
                         limit = "1")
         static void doLocalsStorageLoop(PFrame pyFrame, Frame frameToSync,
+                        @Cached("createClassProfile()") ValueProfile frameProfile,
                         @Cached("frameToSync.getFrameDescriptor()") FrameDescriptor cachedFd,
                         @Cached(value = "getSlots(cachedFd)", dimensions = 1) FrameSlot[] cachedSlots) {
             boolean invalidState = false;
             LocalsStorage localsStorage = getLocalsStorage(pyFrame);
-            MaterializedFrame target = localsStorage.getFrame();
+            MaterializedFrame target = frameProfile.profile(localsStorage.getFrame());
             assert cachedFd == target.getFrameDescriptor();
 
             for (int i = 0; i < cachedSlots.length; i++) {
@@ -462,13 +465,14 @@ static void doLocalsStorageLoop(PFrame pyFrame, Frame frameToSync,
             }
         }
 
-        @Specialization(guards = "hasLocalsStorage(pyFrame, frameToSync)", replaces = {"doLocalsStorageCached", "doLocalsStorageLoop"})
-        static void doLocalsStorageUncached(PFrame pyFrame, Frame frameToSync) {
+        @Specialization(guards = "hasLocalsStorage(pyFrame, frameToSync, frameProfile)", replaces = {"doLocalsStorageCached", "doLocalsStorageLoop"})
+        static void doLocalsStorageUncached(PFrame pyFrame, Frame frameToSync,
+                        @Cached("createClassProfile()") ValueProfile frameProfile) {
             FrameDescriptor fd = frameToSync.getFrameDescriptor();
             FrameSlot[] cachedSlots = getSlots(fd);
             try {
                 LocalsStorage localsStorage = getLocalsStorage(pyFrame);
-                MaterializedFrame target = localsStorage.getFrame();
+                MaterializedFrame target = frameProfile.profile(localsStorage.getFrame());
                 assert fd == target.getFrameDescriptor();
 
                 for (int i = 0; i < cachedSlots.length; i++) {
@@ -615,9 +619,10 @@ static void doGenericDict(VirtualFrame frame, PFrame pyFrame, Frame frameToSync)
             }
         }
 
-        @Specialization(guards = "isCustomLocalsObject(pyFrame, frameToSync)")
+        @Specialization(guards = "isCustomLocalsObject(pyFrame, frameToSync, frameProfile)")
         @SuppressWarnings("unused")
-        static void doCustomLocalsObject(PFrame pyFrame, Frame frameToSync) {
+        static void doCustomLocalsObject(PFrame pyFrame, Frame frameToSync,
+                        @Cached("createClassProfile()") ValueProfile frameProfile) {
             // nothing to do; we already worked on the custom object
         }
 
@@ -639,9 +644,9 @@ protected static ConditionProfile[] getProfiles(int n) {
          * same frame descriptor as the frame to synchronize. That means, the dict represents
          * unmodified set of frame values of the frame to sync.
          */
-        protected static boolean hasLocalsStorage(PFrame pyFrame, Frame frameToSync) {
+        protected static boolean hasLocalsStorage(PFrame pyFrame, Frame frameToSync, ValueProfile frameProfile) {
             Object localsObject = pyFrame.getLocalsDict();
-            return localsObject instanceof PDict && getFd(((PDict) localsObject).getDictStorage()) == frameToSync.getFrameDescriptor();
+            return localsObject instanceof PDict && getFd(((PDict) localsObject).getDictStorage(), frameProfile) == frameToSync.getFrameDescriptor();
         }
 
         protected static boolean isDictWithCustomStorage(PFrame pyFrame) {
@@ -650,17 +655,17 @@ protected static boolean isDictWithCustomStorage(PFrame pyFrame) {
             return PythonObjectLibrary.getUncached().getLazyPythonClass(localsObject) == PythonBuiltinClassType.PDict;
         }
 
-        protected static boolean isCustomLocalsObject(PFrame pyFrame, Frame frameToSync) {
-            return !hasLocalsStorage(pyFrame, frameToSync);
+        protected static boolean isCustomLocalsObject(PFrame pyFrame, Frame frameToSync, ValueProfile frameProfile) {
+            return !hasLocalsStorage(pyFrame, frameToSync, frameProfile);
         }
 
         protected static LocalsStorage getLocalsStorage(PFrame pyFrame) {
             return (LocalsStorage) ((PDict) pyFrame.getLocalsDict()).getDictStorage();
         }
 
-        private static FrameDescriptor getFd(HashingStorage storage) {
+        private static FrameDescriptor getFd(HashingStorage storage, ValueProfile frameProfile) {
             if (storage instanceof LocalsStorage) {
-                return ((LocalsStorage) storage).getFrame().getFrameDescriptor();
+                return frameProfile.profile(((LocalsStorage) storage).getFrame()).getFrameDescriptor();
             }
             return null;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/BuiltinFunctionRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/BuiltinFunctionRootNode.java
@@ -354,7 +354,9 @@ public Builtin getBuiltin() {
     @Override
     public String toString() {
         CompilerAsserts.neverPartOfCompilation();
-        return "<builtin function " + name + " at " + Integer.toHexString(hashCode()) + ">";
+        Class<?> clazz = factory.getNodeClass().getEnclosingClass();
+        String context = clazz == null ? "" : clazz.getSimpleName() + ".";
+        return "<builtin function " + context + name + " at " + Integer.toHexString(hashCode()) + ">";
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/DictConcatNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/DictConcatNode.java
@@ -47,14 +47,12 @@
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 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.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-@GenerateNodeFactory
 public abstract class DictConcatNode extends ExpressionNode {
 
     @Children final ExpressionNode[] mappables;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/SetLiteralNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/SetLiteralNode.java
@@ -37,14 +37,12 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedLanguage;
-import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-@GenerateNodeFactory
 public abstract class SetLiteralNode extends LiteralNode {
     @Child private PythonObjectFactory factory = PythonObjectFactory.create();
     @Children private final ExpressionNode[] values;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/RaiseNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/RaiseNode.java
@@ -76,7 +76,7 @@ static void setCause(@SuppressWarnings("unused") VirtualFrame frame, PBaseExcept
 
         // raise * from <class>
         @Specialization(guards = "lib.isLazyPythonClass(causeClass)")
-        static void setCause(@SuppressWarnings("unused") VirtualFrame frame, PBaseException exception, Object causeClass,
+        static void setCause(VirtualFrame frame, PBaseException exception, Object causeClass,
                         @Cached BranchProfile baseCheckFailedProfile,
                         @Cached ValidExceptionNode validException,
                         @Cached CallNode callConstructor,
@@ -86,7 +86,7 @@ static void setCause(@SuppressWarnings("unused") VirtualFrame frame, PBaseExcept
                 baseCheckFailedProfile.enter();
                 throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.EXCEPTION_CAUSES_MUST_DERIVE_FROM_BASE_EX);
             }
-            Object cause = callConstructor.execute(causeClass);
+            Object cause = callConstructor.execute(frame, causeClass);
             if (cause instanceof PBaseException) {
                 exception.setCause((PBaseException) cause);
             } else {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SliceLiteralNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SliceLiteralNode.java
@@ -98,12 +98,12 @@ public PSlice doInt(PNone start, int stop, int step) {
 
     @Specialization(guards = {"isNoValue(second)", "isNoValue(third)"})
     @SuppressWarnings("unused")
-    public Object sliceStop(int first, PNone second, PNone third) {
+    public PSlice sliceStop(int first, PNone second, PNone third) {
         return factory.createIntSlice(0, first, 1, true, true);
     }
 
     @Specialization(guards = {"!isNoValue(stop)", "!isNoValue(step)"})
-    public Object doGeneric(Object start, Object stop, Object step) {
+    public PSlice doGeneric(Object start, Object stop, Object step) {
         return factory.createObjectSlice(start, stop, step);
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java
@@ -106,6 +106,8 @@
 import com.oracle.truffle.api.utilities.CyclicAssumption;
 
 public final class PythonContext {
+    private static final Source IMPORT_WARNINGS_SOURCE = Source.newBuilder(PythonLanguage.ID, "import warnings\n", "<internal>").internal(true).build();
+    private static final Source FORCE_IMPORTS_SOURCE = Source.newBuilder(PythonLanguage.ID, "import site\n", "<internal>").internal(true).build();
     private static final TruffleLogger LOGGER = PythonLanguage.getLogger(PythonContext.class);
     private volatile boolean finalizing;
 
@@ -467,12 +469,12 @@ public void patch(Env newEnv) {
 
     private void importSiteIfForced() {
         if (getOption(PythonOptions.ForceImportSite)) {
-            CallTarget site = env.parsePublic(Source.newBuilder(PythonLanguage.ID, "import site\n", "<internal>").internal(true).build());
+            CallTarget site = env.parsePublic(FORCE_IMPORTS_SOURCE);
             site.call();
         }
         if (!getOption(PythonOptions.WarnOptions).isEmpty()) {
             // we must force an import of the warnings module here if warnings were passed
-            CallTarget site = env.parsePublic(Source.newBuilder(PythonLanguage.ID, "import warnings\n", "<internal>").internal(true).build());
+            CallTarget site = env.parsePublic(IMPORT_WARNINGS_SOURCE);
             site.call();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ Object dir(VirtualFrame frame, PythonModule self,`
`159`	`159`	`HashingStorage dictStorage = getDictStorageNode.execute((PHashingCollection) dict);`
`160`	`160`	`Object dirFunc = hashLib.getItem(dictStorage, __DIR__);`
`161`	`161`	`if (dirFunc != null) {`
`162`		`- return callNode.execute(dirFunc);`
	`162`	`+ return callNode.execute(frame, dirFunc);`
`163`	`163`	`} else {`
`164`	`164`	`return constructListNode.execute(dict);`
`165`	`165`	`}`