[GR-23251] Get test_pkg to pass.

PullRequest: graalpython/1158

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_pkg.txt

@@ -1,4 +1,8 @@
 *graalpython.lib-python.3.test.test_pkg.TestPkg.test_1
+*graalpython.lib-python.3.test.test_pkg.TestPkg.test_2
 *graalpython.lib-python.3.test.test_pkg.TestPkg.test_3
 *graalpython.lib-python.3.test.test_pkg.TestPkg.test_4
+*graalpython.lib-python.3.test.test_pkg.TestPkg.test_5
+*graalpython.lib-python.3.test.test_pkg.TestPkg.test_6
+*graalpython.lib-python.3.test.test_pkg.TestPkg.test_7
 *graalpython.lib-python.3.test.test_pkg.TestPkg.test_8

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/GetCurrentFrameRef.java

@@ -115,4 +115,8 @@ static ConditionProfile[] getFlag() {
     static ConditionProfile[] getFlagUncached() {
         return DISABLED;
     }
+
+    public static GetCurrentFrameRef create() {
+        return GetCurrentFrameRefNodeGen.create();
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadLocalsNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,6 +44,7 @@
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.frame.PFrame.Reference;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.nodes.function.ClassBodyRootNode;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.dsl.Cached;
@@ -52,6 +53,7 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 /**
  * Read the locals from the passed frame, updating them from the frame if that is needed. This does
@@ -97,4 +99,26 @@ Object frameToUpdate(PFrame frame,
                     @Shared("factory") @Cached PythonObjectFactory factory) {
         return frame.getLocals(factory);
     }
+
+    public static ReadLocalsNode create() {
+        return ReadLocalsNodeGen.create();
+    }
+
+    /**
+     * Fast access to custom locals if a custom dict was provided by the caller and the python frame
+     * does not escape.
+     *
+     * @param frame the current frame
+     * @param havePyFrame profile if we do have a python frame (PFrame)
+     * @param haveCustomLocals profile if the python frame has a custom set locals dict
+     * @return the custom locals (if found) or the globals
+     */
+    public static PythonObject fastGetCustomLocalsOrGlobals(VirtualFrame frame, ConditionProfile havePyFrame, ConditionProfile haveCustomLocals) {
+        PFrame pyFrame = PArguments.getCurrentFrameInfo(frame).getPyFrame();
+        if (havePyFrame.profile(pyFrame != null) && haveCustomLocals.profile(pyFrame.getLocals(null) != null)) {
+            return (PythonObject) pyFrame.getLocals(null);
+        }
+        // return the globals
+        return PArguments.getGlobals(frame);
+    }
 }

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

@@ -25,6 +25,8 @@
  */
 package com.oracle.graal.python.nodes.statement;
 
+import static com.oracle.graal.python.nodes.frame.ReadLocalsNode.fastGetCustomLocalsOrGlobals;
+
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -57,6 +59,8 @@
 
 public class ImportStarNode extends AbstractImportNode {
     private final ConditionProfile javaImport = ConditionProfile.createBinaryProfile();
+    private final ConditionProfile havePyFrame = ConditionProfile.createBinaryProfile();
+    private final ConditionProfile haveCustomLocals = ConditionProfile.createBinaryProfile();
 
     @Child private SetItemNode dictWriteNode;
     @Child private SetAttributeNode.Dynamic setAttributeNode;
@@ -105,7 +109,7 @@ public ImportStarNode(String moduleName, int level) {
     @Override
     public void executeVoid(VirtualFrame frame) {
         Object importedModule = importModule(frame, moduleName, PArguments.getGlobals(frame), new String[]{"*"}, level);
-        PythonObject globals = PArguments.getGlobals(frame);
+        PythonObject locals = fastGetCustomLocalsOrGlobals(frame, havePyFrame, haveCustomLocals);
 
         if (javaImport.profile(emulateJython() && getContext().getEnv().isHostObject(importedModule))) {
             try {
@@ -116,7 +120,7 @@ public void executeVoid(VirtualFrame frame) {
                     // interop protocol guarantees these are Strings
                     String attrName = (String) interopLib.readArrayElement(hostAttrs, i);
                     Object attr = interopLib.readMember(importedModule, attrName);
-                    writeAttribute(frame, globals, attrName, attr);
+                    writeAttribute(frame, locals, attrName, attr);
                 }
             } catch (UnknownIdentifierException | UnsupportedMessageException | InvalidArrayIndexException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -137,7 +141,7 @@ public void executeVoid(VirtualFrame frame) {
                         throw raise(PythonBuiltinClassType.TypeError, ErrorMessages.ATTR_NAME_MUST_BE_STRING, attrNameObj);
                     }
                     Object attr = readAttribute(frame, importedModule, attrName);
-                    writeAttribute(frame, globals, attrName, attr);
+                    writeAttribute(frame, locals, attrName, attr);
                 }
             } catch (PException e) {
                 e.expectAttributeError(ensureIsAttributeErrorProfile());
@@ -148,7 +152,7 @@ public void executeVoid(VirtualFrame frame) {
                     // 'ceval.c: import_all_from')
                     if (!name.startsWith("__")) {
                         Object attr = readAttribute(frame, importedModule, name);
-                        writeAttribute(frame, globals, name, attr);
+                        writeAttribute(frame, locals, name, attr);
                     }
                 }
             }

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "d6816740ee697b99c43e8d7112cd368a9557a965",
+                "version": "65dac0b492ab4f3a327e07cfc8b54558685b5b1c",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "d6816740ee697b99c43e8d7112cd368a9557a965",
+                "version": "65dac0b492ab4f3a327e07cfc8b54558685b5b1c",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "d6816740ee697b99c43e8d7112cd368a9557a965",
+                "version": "65dac0b492ab4f3a327e07cfc8b54558685b5b1c",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},