[GR-29185] Use LookupAttributeInMRO in LookupAndCallTernaryNode.

PullRequest: graalpython/1588

Author: steve-s

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

@@ -55,3 +55,18 @@ def m(self):
     assert_raises(TypeError, object.__setattr__, M('m'), type, 42)
     assert_raises(TypeError, types.ModuleType.__setattr__, M('m'), type, 42)
     assert_raises(TypeError, types.MethodType.__setattr__, M('m').m, type, 42)
+
+
+def test_overriding_via_getattribute_should_not_work():
+    class MyMeta(type):
+        def __getattribute__(self, item):
+            if item == '__setattr__':
+                return lambda self, key, value: None
+            return super(MyMeta, self).__getattribute__(item)
+
+    class Cls(metaclass=MyMeta):
+        pass
+
+    x = Cls()
+    x.bar = 42 # should not call __getattribute__ to get __setattr__
+    assert x.bar == 42

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallTernaryNode.java

@@ -42,23 +42,26 @@
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 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;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
 // cpython://Objects/abstract.c#ternary_op
 // Order operations are tried until either a valid result or error: v.op(v,w,z), w.op(v,w,z), z.op(v,w,z)
-@ImportStatic({SpecialMethodNames.class})
+@ImportStatic({SpecialMethodNames.class, PythonOptions.class})
 public abstract class LookupAndCallTernaryNode extends Node {
     public abstract static class NotImplementedHandler extends PNodeWithContext {
         public abstract Object execute(Object arg, Object arg2, Object arg3);
@@ -100,26 +103,30 @@ protected boolean isReversible() {
         return isReversible;
     }
 
-    @Specialization(guards = "!isReversible()")
+    @Specialization(guards = "!isReversible()", limit = "getCallSiteInlineCacheMaxDepth()")
     Object callObject(
                     VirtualFrame frame,
                     Object arg1,
                     int arg2,
                     Object arg3,
-                    @Cached("create()") GetClassNode getclass,
-                    @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode getattr) {
-        return dispatchNode.execute(frame, getattr.executeObject(frame, getclass.execute(arg1), name), arg1, arg2, arg3);
+                    @CachedLibrary("arg1") PythonObjectLibrary libArg1,
+                    @Cached("create(name, ignoreDescriptorException)") LookupSpecialMethodNode getattr) {
+        Object klass = libArg1.getLazyPythonClass(arg1);
+        Object value = libArg1.getDelegatedValue(arg1);
+        return dispatchNode.execute(frame, getattr.execute(frame, klass, value), value, arg2, arg3);
     }
 
-    @Specialization(guards = "!isReversible()")
+    @Specialization(guards = "!isReversible()", limit = "getCallSiteInlineCacheMaxDepth()")
     Object callObject(
                     VirtualFrame frame,
                     Object arg1,
                     Object arg2,
                     Object arg3,
-                    @Cached("create()") GetClassNode getclass,
-                    @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode getattr) {
-        return dispatchNode.execute(frame, getattr.executeObject(frame, getclass.execute(arg1), name), arg1, arg2, arg3);
+                    @CachedLibrary("arg1") PythonObjectLibrary libArg1,
+                    @Cached("create(name, ignoreDescriptorException)") LookupSpecialMethodNode getattr) {
+        Object klass = libArg1.getLazyPythonClass(arg1);
+        Object value = libArg1.getDelegatedValue(arg1);
+        return dispatchNode.execute(frame, getattr.execute(frame, klass, value), value, arg2, arg3);
     }
 
     private CallTernaryMethodNode ensureReverseDispatch() {