[GR-38445] Evaluate if PCallCapiFunction and PCallCExtFunction could be merged into one Node.

PullRequest: graalpython/2780

Author: tomasstupka

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtCommonNodes.java

@@ -111,7 +111,6 @@
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
@@ -212,32 +211,6 @@ protected Object importCAPISymbolUncached(CExtContext nativeContext, NativeCExtS
         }
     }
 
-    @GenerateUncached
-    public abstract static class PCallCExtFunction extends PNodeWithContext {
-
-        public final Object call(CExtContext nativeContext, NativeCExtSymbol symbol, Object... args) {
-            return execute(nativeContext, symbol, args);
-        }
-
-        protected abstract Object execute(CExtContext nativeContext, NativeCExtSymbol symbol, Object[] args);
-
-        @Specialization
-        static Object doIt(CExtContext nativeContext, NativeCExtSymbol symbol, Object[] args,
-                        @CachedLibrary(limit = "1") InteropLibrary interopLibrary,
-                        @Cached ImportCExtSymbolNode importCExtSymbolNode,
-                        @Cached EnsureTruffleStringNode ensureTruffleStringNode,
-                        @Cached PRaiseNode raiseNode) {
-            try {
-                // TODO review EnsureTruffleString with GR-37896
-                return ensureTruffleStringNode.execute(interopLibrary.execute(importCExtSymbolNode.execute(nativeContext, symbol), args));
-            } catch (UnsupportedTypeException | ArityException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.TypeError, e);
-            } catch (UnsupportedMessageException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.TypeError, ErrorMessages.CAPI_SYM_NOT_CALLABLE, symbol.getTsName());
-            }
-        }
-    }
-
     @GenerateUncached
     public abstract static class EnsureTruffleStringNode extends Node {
         public abstract Object execute(Object obj);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtParseArgumentsNode.java

@@ -59,14 +59,14 @@
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsCharPointerNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsNativeComplexNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PRaiseNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.TransformExceptionToNativeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.AsNativeDoubleNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.AsNativePrimitiveNode;
-import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.PCallCExtFunction;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtParseArgumentsNodeFactory.ConvertSingleArgNodeGen;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageLen;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
@@ -619,7 +619,7 @@ abstract static class ConvertArgNode extends Node {
         @Specialization(guards = "c == FORMAT_LOWER_Y")
         void doBufferR(@SuppressWarnings("unused") int c, int la, Object arg, Object varargs,
                         @Cached GetNextVaArgNode getVaArgNode,
-                        @Cached PCallCExtFunction callGetBufferRwNode,
+                        @Cached PCallCapiFunction callGetBufferRwNode,
                         @Shared("writeOutVarNode") @Cached WriteNextVaArgNode writeOutVarNode,
                         @Cached ToSulongNode argToSulongNode,
                         @Shared("raiseNode") @Cached PRaiseNativeNode raiseNode) throws InteropException {
@@ -712,7 +712,7 @@ static void doObject(@SuppressWarnings("unused") int c, int la, Object arg, Obje
         @Specialization(guards = "c == FORMAT_LOWER_W")
         void doBufferRW(@SuppressWarnings("unused") int c, int la, Object arg, Object varargs,
                         @Cached GetNextVaArgNode getVaArgNode,
-                        @Cached PCallCExtFunction callGetBufferRwNode,
+                        @Cached PCallCapiFunction callGetBufferRwNode,
                         @Cached ToSulongNode toNativeNode,
                         @Shared("raiseNode") @Cached PRaiseNativeNode raiseNode) throws InteropException, ParseArgumentsException {
             if (la != '*') {
@@ -723,7 +723,7 @@ void doBufferRW(@SuppressWarnings("unused") int c, int la, Object arg, Object va
             getbuffer(callGetBufferRwNode, raiseNode, arg, toNativeNode, pybufferPtr, false);
         }
 
-        private void getbuffer(PCallCExtFunction callGetBufferRwNode, PRaiseNativeNode raiseNode, Object arg, CExtToNativeNode toSulongNode, Object pybufferPtr, boolean readOnly)
+        private void getbuffer(PCallCapiFunction callGetBufferRwNode, PRaiseNativeNode raiseNode, Object arg, CExtToNativeNode toSulongNode, Object pybufferPtr, boolean readOnly)
                         throws ParseArgumentsException {
             NativeCAPISymbol funSymbol = readOnly ? FUN_GET_BUFFER_R : FUN_GET_BUFFER_RW;
             Object rc = callGetBufferRwNode.call(PythonContext.get(this).getCApiContext(), funSymbol, toSulongNode.execute(arg), pybufferPtr);
@@ -745,7 +745,7 @@ private static ParseArgumentsException converterr(PRaiseNativeNode raiseNode, Tr
             throw raise(raiseNode, TypeError, ErrorMessages.MUST_BE_S_NOT_P, msg, arg);
         }
 
-        private int convertbuffer(PCallCExtFunction callConvertbuffer, PRaiseNativeNode raiseNode, Object arg, CExtToNativeNode toSulong, Object voidPtr) {
+        private int convertbuffer(PCallCapiFunction callConvertbuffer, PRaiseNativeNode raiseNode, Object arg, CExtToNativeNode toSulong, Object voidPtr) {
             Object rc = callConvertbuffer.call(PythonContext.get(this).getCApiContext(), FUN_CONVERTBUFFER, toSulong.execute(arg), voidPtr);
             if (!(rc instanceof Number)) {
                 throw CompilerDirectives.shouldNotReachHere("wrong result of internal function");
@@ -912,7 +912,7 @@ Object doGeneric(ParserState state, Object kwds, Object kwdnames, boolean keywor
                         @Shared("getItemNode") @Cached PyTuple_GetItem getItemNode,
                         @CachedLibrary(limit = "1") InteropLibrary kwdnamesLib,
                         @Cached PyDict_GetItem getDictItemNode,
-                        @Cached PCallCExtFunction callCStringToString,
+                        @Cached PCallCapiFunction callCStringToString,
                         @Shared("raiseNode") @Cached PRaiseNativeNode raiseNode) throws InteropException {
 
             Object out = null;