Fix PyTruffleState_FindModule

Author: timfel

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -299,7 +299,7 @@ typedef struct {
     BUILTIN(PyTruffleObject_GenericGetAttr, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PyTruffleObject_GenericSetAttr, int, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PyTruffleObject_GetItemString, PyObject*, PyObject*, const char*) \
-    BUILTIN(PyTruffleState_FindModule, PyObject*, struct PyModuleDef*) \
+    BUILTIN(PyTruffleState_FindModule, PyObject*, Py_ssize_t) \
     BUILTIN(PyTruffleStructSequence_InitType2, int, PyTypeObject*, void*, void*, int) \
     BUILTIN(PyTruffleStructSequence_NewType, PyTypeObject*, const char*, const char*, void*, void*, int) \
     BUILTIN(PyTruffleToCharPointer, void*, PyObject*) \

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltinRegistry.java

@@ -51,7 +51,6 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.LONG_LONG;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Long;
-import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PYMODULEDEF_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_CAPSULE_DESTRUCTOR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_COMPILER_FLAGS;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_GIL_STATE_STATE;
@@ -566,7 +565,7 @@ private PythonCextBuiltinRegistry() {
                     new CApiBuiltinExecutable("PyTruffleObject_GetItemString", Ignored, PyObjectTransfer,
                                     new ArgDescriptor[]{PyObject, ConstCharPtrAsTruffleString}, 201),
                     new CApiBuiltinExecutable("PyTruffleState_FindModule", Ignored, PyObjectBorrowed,
-                                    new ArgDescriptor[]{PYMODULEDEF_PTR}, 202),
+                                    new ArgDescriptor[]{Py_ssize_t}, 202),
                     new CApiBuiltinExecutable("PyTruffleStructSequence_InitType2", Ignored, Int,
                                     new ArgDescriptor[]{PyTypeObject, Pointer, Pointer, Int}, 203),
                     new CApiBuiltinExecutable("PyTruffleStructSequence_NewType", Ignored, PyTypeObjectTransfer,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextPyStateBuiltins.java

@@ -43,10 +43,10 @@
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
-import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PYMODULEDEF_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_GIL_STATE_STATE;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectBorrowed;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyThreadState;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Void;
 
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
@@ -123,7 +123,7 @@ PDict get(@Cached PythonObjectFactory factory) {
         }
     }
 
-    @CApiBuiltin(ret = PyObjectBorrowed, args = {PYMODULEDEF_PTR}, call = Ignored)
+    @CApiBuiltin(ret = PyObjectBorrowed, args = {Py_ssize_t}, call = Ignored)
     abstract static class PyTruffleState_FindModule extends CApiUnaryBuiltinNode {
 
         @Specialization

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

@@ -313,7 +313,7 @@ public enum ArgDescriptor {
 
     func_objint("int (*)(PyObject*value)"),
     func_voidvoidptr("void (*)(void*)"),
-    func_voidvoid("void (*)(void)"),
+    func_voidvoid(ArgBehavior.Pointer, "void (*)(void)"),
     func_intvoidptr("int (*)(void*)"),
     func_objvoid("PyObject*(*)(void)"),
     func_objcharsizevoidptr("PyObject*(*)(const char*, Py_ssize_t, void*)"),