[GR-12020] Work with PythonBuiltinClassType directly where possible.

PullRequest: graalpython/217

Author: lukasstadler

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -131,8 +131,8 @@ declare_type(PyByteArray_Type, bytearray, PyByteArrayObject);
 declare_type(PyCFunction_Type, builtin_function_or_method, PyCFunctionObject);
 declare_type(PyMethodDescr_Type, method_descriptor, PyMethodDescrObject);
 declare_type(PyGetSetDescr_Type, getset_descriptor, PyGetSetDescrObject);
-declare_type(PyWrapperDescr_Type, wrapper_descriptor, PyWrapperDescrObject);
-declare_type(PyMemberDescr_Type, member_descriptor, PyMemberDescrObject);
+declare_type(PyWrapperDescr_Type, method_descriptor, PyWrapperDescrObject); // LS: previously wrapper_descriptor
+declare_type(PyMemberDescr_Type, property, PyMemberDescrObject); // LS: previously member_descriptor
 declare_type(_PyExc_BaseException, BaseException, PyBaseExceptionObject);
 declare_type(PyBuffer_Type, buffer, PyBufferDecorator);
 declare_type(PyFunction_Type, function, PyFunctionObject);

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/PRangeTests.java

@@ -35,14 +35,14 @@
 import com.oracle.graal.python.builtins.objects.range.PRange;
 import com.oracle.graal.python.nodes.control.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.test.PythonTests;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public class PRangeTests {
     @Before
@@ -75,14 +75,14 @@ public void loopWithOnlyStop() throws UnexpectedResultException {
         Object iter = getIter.executeWith(range);
         GetNextNode next = GetNextNode.create();
         testRoot.doInsert(next);
-        ConditionProfile errorProfile = ConditionProfile.createBinaryProfile();
+        IsBuiltinClassProfile errorProfile = IsBuiltinClassProfile.create();
 
         while (true) {
             try {
                 int item = next.executeInt(iter);
                 assertEquals(index, item);
             } catch (PException e) {
-                e.expectStopIteration(PythonLanguage.getCore(), errorProfile);
+                e.expectStopIteration(errorProfile);
                 break;
             }
             index++;
@@ -99,14 +99,14 @@ public void loopWithStep() throws UnexpectedResultException {
         Object iter = getIter.executeWith(range);
         GetNextNode next = GetNextNode.create();
         testRoot.doInsert(next);
-        ConditionProfile errorProfile = ConditionProfile.createBinaryProfile();
+        IsBuiltinClassProfile errorProfile = IsBuiltinClassProfile.create();
 
         while (true) {
             try {
                 int item = next.executeInt(iter);
                 assertEquals(index, item);
             } catch (PException e) {
-                e.expectStopIteration(PythonLanguage.getCore(), errorProfile);
+                e.expectStopIteration(errorProfile);
                 break;
             }
             index += 2;

graalpython/com.oracle.graal.python.test/src/tests/test_module_property.py

@@ -0,0 +1,68 @@
+# Copyright (c) 2018, 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+def test_builtins():
+    import array
+    assert array.array.__module__ == "array" # builtin class
+    assert int.__module__ == "builtins" # builtin class
+    import sys
+    assert sys.getrecursionlimit.__module__ == "sys" # builtin module method
+
+def test_imported():
+    import code
+    assert code.InteractiveInterpreter.__module__ == "code" # class
+    assert code.InteractiveInterpreter.runsource.__module__ == "code" # function
+    assert code.InteractiveInterpreter().runsource.__module__ == "code" # method
+
+class TestClass():
+    def foo(self):
+        pass
+
+def test_user_class():
+    assert TestClass.__module__ == __name__
+    assert TestClass().__module__ == __name__
+    assert TestClass.foo.__module__ == __name__
+    assert TestClass().foo.__module__ == __name__
+    # test redefine:
+    TestClass.__module__ = "bar"
+    assert TestClass.__module__ == "bar"
+    t = TestClass()
+    t.__module__ = "baz"
+    assert t.__module__ == "baz"

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -30,12 +30,14 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
 
 import org.graalvm.options.OptionDescriptors;
 
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
@@ -78,6 +80,9 @@
 import com.oracle.truffle.api.nodes.ExecutableNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.object.Layout;
+import com.oracle.truffle.api.object.ObjectType;
+import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.Source.SourceBuilder;
 
@@ -101,6 +106,9 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     private final NodeFactory nodeFactory;
     public final ConcurrentHashMap<Class<? extends PythonBuiltinBaseNode>, RootCallTarget> builtinCallTargetCache = new ConcurrentHashMap<>();
 
+    private static final Layout objectLayout = Layout.newLayout().build();
+    private static final Shape freshShape = objectLayout.createShape(new ObjectType());
+
     public PythonLanguage() {
         this.nodeFactory = NodeFactory.create(this);
     }
@@ -384,12 +392,34 @@ public static Source newSource(PythonContext ctxt, String src, String name) {
         }
     }
 
-    public static Source newSource(PythonContext ctxt, TruffleFile src, String name) throws IOException {
-        return newSource(ctxt, Source.newBuilder(ID, src), name);
+    private final ConcurrentHashMap<Object, Source> cachedSources = new ConcurrentHashMap<>();
+
+    public Source newSource(PythonContext ctxt, TruffleFile src, String name) throws IOException {
+        try {
+            return cachedSources.computeIfAbsent(src, t -> {
+                try {
+                    return newSource(ctxt, Source.newBuilder(ID, src), name);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        } catch (RuntimeException e) {
+            throw (IOException) e.getCause();
+        }
     }
 
-    public static Source newSource(PythonContext ctxt, URL url, String name) throws IOException {
-        return newSource(ctxt, Source.newBuilder(ID, url), name);
+    public Source newSource(PythonContext ctxt, URL url, String name) throws IOException {
+        try {
+            return cachedSources.computeIfAbsent(url, t -> {
+                try {
+                    return newSource(ctxt, Source.newBuilder(ID, url), name);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        } catch (RuntimeException e) {
+            throw (IOException) e.getCause();
+        }
     }
 
     private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder, String name) throws IOException {
@@ -411,4 +441,14 @@ protected void initializeMultipleContexts() {
         super.initializeMultipleContexts();
         singleContextAssumption.invalidate();
     }
+
+    private final ConcurrentHashMap<String, PCode> cachedCode = new ConcurrentHashMap<>();
+
+    public Object cacheCode(String filename, Supplier<PCode> createCode) {
+        return cachedCode.computeIfAbsent(filename, f -> createCode.get());
+    }
+
+    public static Shape freshShape() {
+        return freshShape;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/BoundBuiltinCallable.java

@@ -43,5 +43,5 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 
 public interface BoundBuiltinCallable<T> {
-    T boundToObject(Object binding, PythonObjectFactory factory);
+    T boundToObject(PythonBuiltinClassType binding, PythonObjectFactory factory);
 }