Add missing callUnboundMethodIgnoreGetExceptionWithState

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PBuiltinFunction.java

@@ -49,7 +49,6 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -179,16 +178,26 @@ public Object getLazyPythonClass() {
     }
 
     @ExportMessage
+    // Note: Avoiding calling __get__ for builtin functions seems like just an optimization, but it
+    // is actually necessary for being able to correctly call special methods on None, because
+    // type(None).__eq__.__get__(None, type(None)) wouldn't bind the method correctly
     public Object callUnboundMethodWithState(ThreadState state, Object receiver, Object[] arguments,
                     @Shared("gotState") @Cached ConditionProfile gotState,
-                    @Exclusive @Cached CallUnboundMethodNode call) {
+                    @Shared("callMethod") @Cached CallUnboundMethodNode call) {
         VirtualFrame frame = null;
         if (gotState.profile(state != null)) {
             frame = PArguments.frameForCall(state);
         }
         return call.execute(frame, this, receiver, arguments);
     }
 
+    @ExportMessage
+    public Object callUnboundMethodIgnoreGetExceptionWithState(ThreadState state, Object receiver, Object[] arguments,
+                    @Shared("gotState") @Cached ConditionProfile gotState,
+                    @Shared("callMethod") @Cached CallUnboundMethodNode call) {
+        return callUnboundMethodWithState(state, receiver, arguments, gotState, call);
+    }
+
     @GenerateUncached
     public abstract static class CallUnboundMethodNode extends Node {
         public abstract Object execute(Frame frame, PBuiltinFunction method, Object receiver, Object[] arguments);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java

@@ -42,7 +42,6 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -237,11 +236,18 @@ public Object getLazyPythonClass() {
     @ExportMessage
     public Object callUnboundMethodWithState(ThreadState state, Object receiver, Object[] arguments,
                     @Shared("gotState") @Cached ConditionProfile gotState,
-                    @Exclusive @Cached CallNode call) {
+                    @Shared("callMethod") @Cached CallNode call) {
         VirtualFrame frame = null;
         if (gotState.profile(state != null)) {
             frame = PArguments.frameForCall(state);
         }
         return call.execute(frame, this, PositionalArgumentsNode.prependArgument(receiver, arguments));
     }
+
+    @ExportMessage
+    public Object callUnboundMethodIgnoreGetExceptionWithState(ThreadState state, Object receiver, Object[] arguments,
+                    @Shared("gotState") @Cached ConditionProfile gotState,
+                    @Shared("callMethod") @Cached CallNode call) {
+        return callUnboundMethodWithState(state, receiver, arguments, gotState, call);
+    }
 }