Skip to content

Commit 78be345

Browse files
committed
Regenerate C API forwards
1 parent 3a7f9dc commit 78be345

File tree

4 files changed

+306
-304
lines changed

4 files changed

+306
-304
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,14 +1729,6 @@ PyAPI_FUNC(PyObject*) PyFrozenSet_New(PyObject* a) {
17291729
PyAPI_FUNC(int) PyGILState_Check() {
17301730
return GraalPyGILState_Check();
17311731
}
1732-
#undef PyGILState_Ensure
1733-
PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure() {
1734-
return GraalPyGILState_Ensure();
1735-
}
1736-
#undef PyGILState_Release
1737-
PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE a) {
1738-
GraalPyGILState_Release(a);
1739-
}
17401732
#undef PyImport_GetModuleDict
17411733
PyAPI_FUNC(PyObject*) PyImport_GetModuleDict() {
17421734
return GraalPyImport_GetModuleDict();
@@ -2213,6 +2205,14 @@ PyAPI_FUNC(int) PyTraceMalloc_Track(unsigned int a, uintptr_t b, size_t c) {
22132205
PyAPI_FUNC(int) PyTraceMalloc_Untrack(unsigned int a, uintptr_t b) {
22142206
return GraalPyTraceMalloc_Untrack(a, b);
22152207
}
2208+
#undef PyTruffleGILState_Ensure
2209+
PyAPI_FUNC(int) PyTruffleGILState_Ensure() {
2210+
return GraalPyTruffleGILState_Ensure();
2211+
}
2212+
#undef PyTruffleGILState_Release
2213+
PyAPI_FUNC(void) PyTruffleGILState_Release() {
2214+
GraalPyTruffleGILState_Release();
2215+
}
22162216
#undef PyTruffle_Debug
22172217
PyAPI_FUNC(int) PyTruffle_Debug(void* a) {
22182218
return GraalPyTruffle_Debug(a);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ typedef struct {
170170
BUILTIN(PyFrame_New, PyFrameObject*, PyThreadState*, PyCodeObject*, PyObject*, PyObject*) \
171171
BUILTIN(PyFrozenSet_New, PyObject*, PyObject*) \
172172
BUILTIN(PyGILState_Check, int) \
173-
BUILTIN(PyGILState_Ensure, PyGILState_STATE) \
174-
BUILTIN(PyGILState_Release, void, PyGILState_STATE) \
175173
BUILTIN(PyImport_GetModuleDict, PyObject*) \
176174
BUILTIN(PyImport_Import, PyObject*, PyObject*) \
177175
BUILTIN(PyImport_ImportModule, PyObject*, const char*) \
@@ -314,6 +312,8 @@ typedef struct {
314312
BUILTIN(PyTruffleErr_GetExcInfo, PyObject*) \
315313
BUILTIN(PyTruffleErr_WarnExplicit, PyObject*, PyObject*, PyObject*, PyObject*, int, PyObject*, PyObject*) \
316314
BUILTIN(PyTruffleFloat_AsDouble, double, PyObject*) \
315+
BUILTIN(PyTruffleGILState_Ensure, int) \
316+
BUILTIN(PyTruffleGILState_Release, void) \
317317
BUILTIN(PyTruffleHash_InitSecret, void, void*) \
318318
BUILTIN(PyTruffleLong_AsPrimitive, long, PyObject*, int, long) \
319319
BUILTIN(PyTruffleLong_FromString, PyObject*, const char*, int, int) \

graalpython/com.oracle.graal.python.jni/src/capi_forwards.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ void unimplemented(const char* name) {
737737
#undef PyTruffleErr_WarnExplicit
738738
#undef PyTruffleFloat_AsDouble
739739
#undef PyTruffleFrame_New
740+
#undef PyTruffleGILState_Ensure
741+
#undef PyTruffleGILState_Release
740742
#undef PyTruffleHash_InitSecret
741743
#undef PyTruffleLong_AsPrimitive
742744
#undef PyTruffleLong_FromString
@@ -2564,18 +2566,11 @@ PyAPI_FUNC(int) PyGILState_Check() {
25642566
int result = (int) GraalPyGILState_Check();
25652567
return result;
25662568
}
2567-
PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure() {
2568-
PyGILState_STATE result = (PyGILState_STATE) GraalPyGILState_Ensure();
2569-
return result;
2570-
}
25712569
PyThreadState* (*__target__PyGILState_GetThisThreadState)() = NULL;
25722570
PyAPI_FUNC(PyThreadState*) PyGILState_GetThisThreadState() {
25732571
PyThreadState* result = (PyThreadState*) __target__PyGILState_GetThisThreadState();
25742572
return result;
25752573
}
2576-
PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE a) {
2577-
GraalPyGILState_Release(a);
2578-
}
25792574
PyObject* (*__target__PyGen_New)(PyFrameObject*) = NULL;
25802575
PyAPI_FUNC(PyObject*) PyGen_New(PyFrameObject* a) {
25812576
PyObject* result = (PyObject*) __target__PyGen_New(a);
@@ -3955,6 +3950,13 @@ PyAPI_FUNC(int) PyTraceMalloc_Untrack(unsigned int a, uintptr_t b) {
39553950
PyAPI_FUNC(PyFrameObject*) PyTruffleFrame_New(PyThreadState* a, PyCodeObject* b, PyObject* c, PyObject* d) {
39563951
unimplemented("PyTruffleFrame_New"); exit(-1);
39573952
}
3953+
PyAPI_FUNC(int) PyTruffleGILState_Ensure() {
3954+
int result = (int) GraalPyTruffleGILState_Ensure();
3955+
return result;
3956+
}
3957+
PyAPI_FUNC(void) PyTruffleGILState_Release() {
3958+
GraalPyTruffleGILState_Release();
3959+
}
39583960
PyAPI_FUNC(int) PyTruffle_Debug(void* a) {
39593961
int result = (int) GraalPyTruffle_Debug(a);
39603962
return result;

0 commit comments

Comments
 (0)