Adapt to upstream changes after rebase

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java

@@ -2409,26 +2409,26 @@ protected static boolean isPythonNativeWrapper(Object object) {
     @GenerateInline(false)
     public abstract static class PyObjectCheckFunctionResultNode extends CheckFunctionResultNode {
         @Specialization(guards = "!isForeignObject.execute(inliningTarget, result)")
-        static Object doPythonObject(PythonThreadState state, TruffleString name, @SuppressWarnings("unused") Object result,
+        static Object doPythonObject(PythonThreadState state, TruffleString name, Object result,
                         @Bind("this") Node inliningTarget,
-                        @Shared @Cached IsForeignObjectNode isForeignObject,
+                        @SuppressWarnings("unused") @Shared @Cached IsForeignObjectNode isForeignObject,
                         @Shared @Cached InlinedConditionProfile indicatesErrorProfile,
-                        @Shared @Cached InlinedConditionProfile errOccurredProfile) {
+                        @Shared @Cached TransformExceptionFromNativeNode transformExceptionFromNativeNode) {
             boolean indicatesError = indicatesErrorProfile.profile(inliningTarget, PGuards.isNoValue(result));
-            DefaultCheckFunctionResultNode.checkFunctionResult(inliningTarget, name, indicatesError, true, state, errOccurredProfile);
+            transformExceptionFromNativeNode.execute(inliningTarget, state, name, indicatesError, true);
             assert !indicatesError; // otherwise we should not reach here
             return result;
         }
 
         @Specialization(guards = "isForeignObject.execute(inliningTarget, result)")
         static Object doForeign(PythonThreadState state, TruffleString name, Object result,
                         @Bind("this") Node inliningTarget,
-                        @Shared @Cached IsForeignObjectNode isForeignObject,
+                        @SuppressWarnings("unused") @Shared @Cached IsForeignObjectNode isForeignObject,
                         @Shared @Cached InlinedConditionProfile indicatesErrorProfile,
-                        @Shared @Cached InlinedConditionProfile errOccurredProfile,
+                        @Shared @Cached TransformExceptionFromNativeNode transformExceptionFromNativeNode,
                         @CachedLibrary(limit = "3") InteropLibrary lib) {
             boolean indicatesError = indicatesErrorProfile.profile(inliningTarget, lib.isNull(result));
-            DefaultCheckFunctionResultNode.checkFunctionResult(inliningTarget, name, indicatesError, true, state, errOccurredProfile);
+            transformExceptionFromNativeNode.execute(inliningTarget, state, name, indicatesError, true);
             assert !indicatesError; // otherwise we should not reach here
             return result;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotDescrGet.java

@@ -164,7 +164,7 @@ static Object callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative s
             // Within GraalPy we use PNone.NONE as indication that the descriptor was found on the
             // target object itself, for native code this marker is 'NULL' (NO_VALUE maps to NULL)
             Object objArg = obj == PNone.NONE ? PNone.NO_VALUE : obj;
-            Object result = externalInvokeNode.call(frame, inliningTarget, ctx, threadState, C_API_TIMING, T___GET__, slot.callable, //
+            Object result = externalInvokeNode.call(frame, inliningTarget, threadState, C_API_TIMING, T___GET__, slot.callable, //
                             selfToNativeNode.execute(self), //
                             objToNativeNode.execute(objArg), //
                             valueToNativeNode.execute(value));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotDescrSet.java

@@ -199,7 +199,7 @@ static void callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative slo
                         @Cached(inline = false) InitCheckFunctionResultNode checkResultNode) {
             PythonContext ctx = PythonContext.get(inliningTarget);
             PythonThreadState threadState = getThreadStateNode.execute(inliningTarget, ctx);
-            Object result = externalInvokeNode.call(frame, inliningTarget, ctx, threadState, C_API_TIMING, T___SET__, slot.callable, //
+            Object result = externalInvokeNode.call(frame, inliningTarget, threadState, C_API_TIMING, T___SET__, slot.callable, //
                             selfToNativeNode.execute(self), //
                             objToNativeNode.execute(obj), //
                             valueToNativeNode.execute(value));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotInquiry.java

@@ -135,7 +135,7 @@ static boolean callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative
                         @Cached(inline = false) CheckInquiryResultNode checkResultNode) {
             PythonContext ctx = PythonContext.get(inliningTarget);
             PythonThreadState threadState = getThreadStateNode.execute(inliningTarget, ctx);
-            Object result = externalInvokeNode.call(frame, inliningTarget, ctx, threadState, C_API_TIMING, T___BOOL__, slot.callable, toNativeNode.execute(self));
+            Object result = externalInvokeNode.call(frame, inliningTarget, threadState, C_API_TIMING, T___BOOL__, slot.callable, toNativeNode.execute(self));
             return checkResultNode.executeBool(threadState, T___BOOL__, result);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotLen.java

@@ -147,7 +147,7 @@ static int callNative(VirtualFrame frame, Node inliningTarget, TpSlotNative slot
                         @Cached(inline = false) CheckPrimitiveFunctionResultNode checkResultNode) {
             PythonContext ctx = PythonContext.get(inliningTarget);
             PythonThreadState state = getThreadStateNode.execute(inliningTarget, ctx);
-            Object result = externalInvokeNode.call(frame, inliningTarget, ctx, state, C_API_TIMING, T___LEN__, slot.callable, toNativeNode.execute(self));
+            Object result = externalInvokeNode.call(frame, inliningTarget, state, C_API_TIMING, T___LEN__, slot.callable, toNativeNode.execute(self));
             long l = checkResultNode.executeLong(state, T___LEN__, result);
             if (l != (int) l) {
                 throw raiseNode.get(inliningTarget).raise(OverflowError, ErrorMessages.CANNOT_FIT_P_INTO_INDEXSIZED_INT, l);