[GR-10764] specialization to bypass the MRO loop when the lookup and the attr value are constant

PullRequest: graalpython/109

Author: lukasstadler

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/PythonModuleTests.java

@@ -36,6 +36,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
@@ -66,15 +67,15 @@ public void pythonModuleTest() {
     public void builtinsMinTest() {
         final PythonModule builtins = context.getBuiltins();
         PBuiltinMethod min = (PBuiltinMethod) builtins.getAttribute(BuiltinNames.MIN);
-        Object returnValue = InvokeNode.create(min).invoke(createWithUserArguments(builtins, 4, 2, 1));
+        Object returnValue = InvokeNode.create(min).execute(null, createWithUserArguments(builtins, 4, 2, 1), PKeyword.EMPTY_KEYWORDS);
         assertEquals(1, returnValue);
     }
 
     @Test
     public void builtinsIntTest() {
         final PythonModule builtins = context.getBuiltins();
         PythonBuiltinClass intClass = (PythonBuiltinClass) builtins.getAttribute(BuiltinNames.INT);
-        Object returnValue = InvokeNode.create(intClass).invoke(createWithUserArguments(intClass, "42"));
+        Object returnValue = InvokeNode.create(intClass).execute(null, createWithUserArguments(intClass, "42"), PKeyword.EMPTY_KEYWORDS);
         assertEquals(42, returnValue);
     }
 
@@ -83,7 +84,7 @@ public void mainModuleTest() {
         PythonModule main = context.getMainModule();
         PythonModule builtins = (PythonModule) main.getAttribute(__BUILTINS__);
         PBuiltinMethod abs = (PBuiltinMethod) builtins.getAttribute(BuiltinNames.ABS);
-        Object returned = InvokeNode.create(abs).invoke(createWithUserArguments(builtins, -42));
+        Object returned = InvokeNode.create(abs).execute(null, createWithUserArguments(builtins, -42), PKeyword.EMPTY_KEYWORDS);
         assertEquals(42, returned);
     }
 

graalpython/com.oracle.graal.python.test/src/tests/test_class-set-attrib.py

@@ -0,0 +1,104 @@
+# 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.
+
+counter = 0
+
+class Foo:
+  def __setattr__(self, key, value):
+    global counter
+    counter = counter + 1
+    object.__setattr__(self, key, value)
+  def __delattr__(self, key):
+    global counter
+    counter = counter + 10
+    object.__delattr__(self, key)
+
+def test_call():
+  global counter
+  counter = 0
+  f = Foo()
+  f.a = 1
+  Foo.b = 123
+  assert counter == 1, "setting attrib on class should not call its own __setattr__"
+  del f.a
+  del Foo.b
+  assert counter == 11, "deleting attrib on class should not call its own __delattr__"
+
+class AClass:
+  pass
+
+class BClass(AClass):
+  pass
+
+class CClass(BClass):
+  pass
+
+class DClass(BClass):
+  pass
+
+def custom_set(self, key, value):
+  object.__setattr__(self, key, value + 10 if isinstance(value, int) else value)
+
+def custom_get(self, key):
+  value = object.__getattribute__(self, key)
+  return value + 100 if isinstance(value, int) else value
+
+def test_assignments():
+  object = CClass()
+  # writing to BClass changes the result, writing to DClass doesn't
+  targets = (AClass, BClass, DClass, CClass, object)
+  results = (0, 1, 1, 3, 4)
+  for i in range(0, len(targets)):
+    targets[i].foo = i
+    assert object.foo == results[i], "normal %d" %i
+  # make sure that a custom __getattribute__ is used
+  BClass.__getattribute__ = custom_get
+  for i in range(0, len(targets)):
+    targets[i].bar = i
+    assert object.bar == results[i] + 100, "custom get %d" % i
+  # check correct lookups when deleting attributes
+  for i in reversed(range(0, len(targets))):
+    assert object.bar == results[i] + 100, "delete %d" % i
+    del targets[i].bar
+  # make sure a custom __setattr__ is used
+  BClass.__setattr__ = custom_set
+  object.baz = 9
+  assert object.baz == 119, "custom set"
+
+

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

@@ -0,0 +1,118 @@
+# 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_class_attr_change():
+    class A(object):
+        counter = 0
+
+    for i in range(10):
+        A.counter += 1
+
+    assert A.counter == 10
+
+
+def test_class_attr_deleted():
+    class A(object):
+        counter = 0
+
+    class B(A):
+        counter = 1
+
+    for i in range(10):
+        B.counter += 1
+
+    assert B.counter == 11
+    assert A.counter == 0
+    del B.counter
+    assert B.counter == 0
+
+    for i in range(10):
+        A.counter += 1
+    assert A.counter == 10
+
+
+def test_class_attr_added():
+    class A(object):
+        counter = 0
+
+    class B(A):
+        pass
+
+    for i in range(10):
+        B.counter += 1
+
+    assert B.counter == 10
+    assert A.counter == 0
+    B.counter = 1
+    assert B.counter == 1
+
+    for i in range(10):
+        A.counter += 1
+    assert A.counter == 10
+
+
+def test_class_attr_add_del():
+    class A:
+        foo = 1
+
+    class B(A):
+        foo = 2
+
+    class C(B):
+        foo = 3
+
+    C.foo += 1
+    C.foo += 1
+    C.foo += 1
+    C.foo += 1
+    C.foo += 1
+    C.foo += 1
+    C.foo += 1
+
+    assert C.foo == 10
+    del C.foo
+    assert C.foo == 2
+    del B.foo
+    assert C.foo == 1
+    B.foo = 5
+    assert C.foo == 5
+    C.foo = 10
+    assert C.foo == 10
+

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

@@ -37,6 +37,7 @@
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 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;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
@@ -356,7 +357,7 @@ protected String toString(PythonContext context, Object value) {
         Object[] userArgs = PArguments.create(2);
         PArguments.setArgument(userArgs, 0, PNone.NONE);
         PArguments.setArgument(userArgs, 1, value);
-        Object res = InvokeNode.create(reprMethod).invoke(userArgs);
+        Object res = InvokeNode.create(reprMethod).execute(null, userArgs, PKeyword.EMPTY_KEYWORDS);
         return res.toString();
     }
 

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

@@ -84,7 +84,7 @@ protected AtExitCallTarget(TruffleLanguage<?> language, Object callable, Object[
 
             @Override
             public Object execute(VirtualFrame frame) {
-                return callNode.execute(callable, arguments, keywords);
+                return callNode.execute(frame, callable, arguments, keywords);
             }
         }
 

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

@@ -159,6 +159,7 @@
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -1175,8 +1176,8 @@ public PList listObject(@SuppressWarnings("unused") Object cls, Object arg) {
     @GenerateNodeFactory
     public abstract static class ObjectNode extends PythonVarargsBuiltinNode {
         @Override
-        public final Object varArgExecute(Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
-            return execute(PNone.NO_VALUE, arguments, keywords);
+        public final Object varArgExecute(VirtualFrame frame, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
+            return execute(frame, PNone.NO_VALUE, arguments, keywords);
         }
 
         @Specialization
@@ -1500,8 +1501,7 @@ public Object type(Object cls, Object obj, PNone bases, PNone dict, PKeyword[] k
         }
 
         @Specialization(guards = {"!isNoValue(bases)", "!isNoValue(namespace)"})
-        @TruffleBoundary
-        public Object type(PythonClass cls, String name, PTuple bases, PDict namespace, PKeyword[] kwds,
+        public Object type(VirtualFrame frame, PythonClass cls, String name, PTuple bases, PDict namespace, PKeyword[] kwds,
                         @Cached("create()") GetClassNode getMetaclassNode,
                         @Cached("create(__NEW__)") LookupInheritedAttributeNode getNewFuncNode,
                         @Cached("create()") CallDispatchNode callNewFuncNode,
@@ -1512,9 +1512,14 @@ public Object type(PythonClass cls, String name, PTuple bases, PDict namespace,
                 if (newFunc instanceof PBuiltinFunction && (((PBuiltinFunction) newFunc).getFunctionRootNode() == getRootNode())) {
                     // the new metaclass has the same __new__ function as we are in
                 } else {
-                    return callNewFuncNode.executeCall(newFunc, createArgs.execute(metaclass, name, bases, namespace), kwds);
+                    return callNewFuncNode.executeCall(frame, newFunc, createArgs.execute(metaclass, name, bases, namespace), kwds);
                 }
             }
+            return typeMetaclass(name, bases, namespace, metaclass);
+        }
+
+        @TruffleBoundary
+        private Object typeMetaclass(String name, PTuple bases, PDict namespace, PythonClass metaclass) {
             if (name.indexOf('\0') != -1) {
                 throw raise(ValueError, "type name must not contain null characters");
             }
@@ -1566,14 +1571,14 @@ private static boolean isSubType(PythonClass subclass, PythonClass superclass) {
             return false;
         }
 
-        protected abstract Object execute(Object cls, Object name, Object bases, Object dict, PKeyword[] kwds);
+        protected abstract Object execute(VirtualFrame frame, Object cls, Object name, Object bases, Object dict, PKeyword[] kwds);
 
         protected static TypeNode create() {
             return BuiltinConstructorsFactory.TypeNodeFactory.create(null);
         }
 
         @Specialization(guards = {"!isNoValue(bases)", "!isNoValue(dict)"})
-        public Object typeGeneric(Object cls, Object name, Object bases, Object dict, PKeyword[] kwds,
+        public Object typeGeneric(VirtualFrame frame, Object cls, Object name, Object bases, Object dict, PKeyword[] kwds,
                         @Cached("create()") TypeNode nextTypeNode) {
             if (PGuards.isNoValue(bases) && !PGuards.isNoValue(dict) || !PGuards.isNoValue(bases) && PGuards.isNoValue(dict)) {
                 throw raise(TypeError, "type() takes 1 or 3 arguments");
@@ -1587,7 +1592,7 @@ public Object typeGeneric(Object cls, Object name, Object bases, Object dict, PK
                 // TODO: this is actually allowed, deal with it
                 throw raise(NotImplementedError, "creating a class with non-class metaclass");
             }
-            return nextTypeNode.execute(cls, name, bases, dict, kwds);
+            return nextTypeNode.execute(frame, cls, name, bases, dict, kwds);
         }
     }
 

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

@@ -1007,7 +1007,7 @@ public Object minmaxBinaryWithKey(Object arg1, Object[] args, PythonObject keywo
         }
 
         private static Object applyKeyFunction(PythonObject keywordArg, CallNode keyCall, Object currentValue) {
-            return keyCall == null ? currentValue : keyCall.execute(keywordArg, new Object[]{currentValue}, PKeyword.EMPTY_KEYWORDS);
+            return keyCall == null ? currentValue : keyCall.execute(null, keywordArg, new Object[]{currentValue}, PKeyword.EMPTY_KEYWORDS);
         }
     }
 
@@ -1145,7 +1145,7 @@ Object round(Object x, Object n,
     public abstract static class SetAttrNode extends PythonBuiltinNode {
         @Specialization
         public Object setAttr(Object object, Object key, Object value,
-                        @Cached("create()") SetAttributeNode setAttrNode) {
+                        @Cached("new()") SetAttributeNode.Dynamic setAttrNode) {
             return setAttrNode.execute(object, key, value);
         }
     }