Skip to content

Commit ff00ffe

Browse files
committed
Fix signature of upcall landing function.
1 parent 66f8db2 commit ff00ffe

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ void *Py_NoValue;
4646

4747

4848
PyObject*(*PY_TRUFFLE_LANDING)(void *rcv, void* name, ...);
49-
PyObject*(*PY_TRUFFLE_LANDING_L)(void *rcv, void* name, ...);
50-
PyObject*(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
49+
uint64_t(*PY_TRUFFLE_LANDING_L)(void *rcv, void* name, ...);
50+
double(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
5151
void*(*PY_TRUFFLE_LANDING_PTR)(void *rcv, void* name, ...);
5252
PyObject*(*PY_TRUFFLE_CEXT_LANDING)(void* name, ...);
5353
uint64_t (*PY_TRUFFLE_CEXT_LANDING_L)(void* name, ...);
@@ -63,8 +63,8 @@ static void initialize_upcall_functions() {
6363
PY_BUILTIN = (void*)polyglot_eval("python", "import builtins\nbuiltins");
6464

6565
PY_TRUFFLE_LANDING = ((PyObject*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall", SRC_CS)));
66-
PY_TRUFFLE_LANDING_L = ((PyObject*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_l", SRC_CS)));
67-
PY_TRUFFLE_LANDING_D = ((PyObject*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_d", SRC_CS)));
66+
PY_TRUFFLE_LANDING_L = ((uint64_t(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_l", SRC_CS)));
67+
PY_TRUFFLE_LANDING_D = ((double(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_d", SRC_CS)));
6868
PY_TRUFFLE_LANDING_PTR = ((void*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_ptr", SRC_CS)));
6969
PY_TRUFFLE_CEXT_LANDING = ((PyObject*(*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall", SRC_CS)));
7070
PY_TRUFFLE_CEXT_LANDING_L = ((uint64_t (*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_l", SRC_CS)));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ extern unsigned init_upcall_n;
8686

8787
/* upcall functions for calling into Python */
8888
extern PyObject*(*PY_TRUFFLE_LANDING)(void *rcv, void* name, ...);
89-
extern PyObject*(*PY_TRUFFLE_LANDING_L)(void *rcv, void* name, ...);
90-
extern PyObject*(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
89+
extern uint64_t(*PY_TRUFFLE_LANDING_L)(void *rcv, void* name, ...);
90+
extern double(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
9191
extern void*(*PY_TRUFFLE_LANDING_PTR)(void *rcv, void* name, ...);
9292
extern PyObject*(*PY_TRUFFLE_CEXT_LANDING)(void* name, ...);
9393
extern uint64_t (*PY_TRUFFLE_CEXT_LANDING_L)(void* name, ...);

0 commit comments

Comments
 (0)