remove landing function around PyState_FindModule. fixes ujson load

timfel · timfel · commit 6a95c2c9f879 · 2021-11-29T15:24:02.000+01:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/pystate.c b/graalpython/com.oracle.graal.python.cext/src/pystate.c
@@ -78,9 +78,10 @@ PyThreadState* PyGILState_GetThisThreadState(void) {
     return polyglot_invoke(PY_TRUFFLE_CEXT, "PyThreadState_Get");
 }
 
-UPCALL_ID(PyState_FindModule)
+typedef PyObject* (*find_module_fun_t)(long index);
+UPCALL_TYPED_ID(PyState_FindModule, find_module_fun_t);
 PyObject* PyState_FindModule(struct PyModuleDef* module) {
-    return UPCALL_CEXT_O(_jls_PyState_FindModule, module->m_base.m_index);
+    return _jls_PyState_FindModule(module->m_base.m_index);
 }
 
 int PyState_AddModule(PyObject* module, struct PyModuleDef* def) {

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,10 @@ PyThreadState* PyGILState_GetThisThreadState(void) {`
`78`	`78`	`return polyglot_invoke(PY_TRUFFLE_CEXT, "PyThreadState_Get");`
`79`	`79`	`}`
`80`	`80`
`81`		`-UPCALL_ID(PyState_FindModule)`
	`81`	`+typedef PyObject* (*find_module_fun_t)(long index);`
	`82`	`+UPCALL_TYPED_ID(PyState_FindModule, find_module_fun_t);`
`82`	`83`	`PyObject* PyState_FindModule(struct PyModuleDef* module) {`
`83`		`- return UPCALL_CEXT_O(_jls_PyState_FindModule, module->m_base.m_index);`
	`84`	`+ return _jls_PyState_FindModule(module->m_base.m_index);`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`int PyState_AddModule(PyObject* module, struct PyModuleDef* def) {`