Stop avoiding _PyThreadState_GET

msimacek · msimacek · commit 585f5653a37d · 2024-03-20T09:13:24.000+01:00
diff --git a/graalpython/com.oracle.graal.python.cext/include/internal/pycore_call.h b/graalpython/com.oracle.graal.python.cext/include/internal/pycore_call.h
@@ -13,9 +13,7 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-#if 0 // GraalPy change
 #include "pycore_pystate.h"       // _PyThreadState_GET()
-#endif // GraalPy change
 
 PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(
     PyThreadState *tstate,
@@ -110,7 +108,7 @@ _PyObject_CallNoArgsTstate(PyThreadState *tstate, PyObject *func) {
 // Private static inline function variant of public PyObject_CallNoArgs()
 static inline PyObject *
 _PyObject_CallNoArgs(PyObject *func) {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
 }
 
diff --git a/graalpython/com.oracle.graal.python.cext/include/internal/pycore_ceval.h b/graalpython/com.oracle.graal.python.cext/include/internal/pycore_ceval.h
@@ -28,14 +28,17 @@ struct _ceval_runtime_state;
 #  endif
 #endif
 
-// #include "pycore_interp.h"        // PyInterpreterState.eval_frame
-// #include "pycore_pystate.h"       // _PyThreadState_GET()
+#if 0 // GraalPy change
+#include "pycore_interp.h"        // PyInterpreterState.eval_frame
+#endif // GraalPy change
+#include "pycore_pystate.h"       // _PyThreadState_GET()
 
 
+#if 0 // GraalPy change
 extern void _Py_FinishPendingCalls(PyThreadState *tstate);
 extern void _PyEval_InitRuntimeState(struct _ceval_runtime_state *);
-// extern void _PyEval_InitState(struct _ceval_state *, PyThread_type_lock);
-// extern void _PyEval_FiniState(struct _ceval_state *ceval);
+extern void _PyEval_InitState(struct _ceval_state *, PyThread_type_lock);
+extern void _PyEval_FiniState(struct _ceval_state *ceval);
 PyAPI_FUNC(void) _PyEval_SignalReceived(PyInterpreterState *interp);
 PyAPI_FUNC(int) _PyEval_AddPendingCall(
     PyInterpreterState *interp,
@@ -71,7 +74,6 @@ extern PyObject* _PyEval_BuiltinsFromGlobals(
     PyObject *globals);
 
 
-/* GraalVM change
 static inline PyObject*
 _PyEval_EvalFrame(PyThreadState *tstate, struct _PyInterpreterFrame *frame, int throwflag)
 {
@@ -80,7 +82,6 @@ _PyEval_EvalFrame(PyThreadState *tstate, struct _PyInterpreterFrame *frame, int
     }
     return tstate->interp->eval_frame(tstate, frame, throwflag);
 }
-*/
 
 extern PyObject*
 _PyEval_Vector(PyThreadState *tstate,
@@ -95,6 +96,7 @@ extern void _PyEval_FiniGIL(PyInterpreterState *interp);
 extern void _PyEval_ReleaseLock(PyThreadState *tstate);
 
 extern void _PyEval_DeactivateOpCache(void);
+#endif // GraalPy change
 
 
 /* --- _Py_EnterRecursiveCall() ----------------------------------------- */
@@ -122,10 +124,7 @@ static inline int _Py_EnterRecursiveCallTstate(PyThreadState *tstate,
 }
 
 static inline int _Py_EnterRecursiveCall(const char *where) {
-    /* GraalVM change
     PyThreadState *tstate = _PyThreadState_GET();
-    */
-    PyThreadState *tstate = PyThreadState_GET();
     return _Py_EnterRecursiveCallTstate(tstate, where);
 }
 
@@ -134,16 +133,15 @@ static inline void _Py_LeaveRecursiveCallTstate(PyThreadState *tstate)  {
 }
 
 static inline void _Py_LeaveRecursiveCall(void)  {
-    /* GraalVM change
     PyThreadState *tstate = _PyThreadState_GET();
-    */
-    PyThreadState *tstate = PyThreadState_GET();
     _Py_LeaveRecursiveCallTstate(tstate);
 }
 
+#if 0 // GraalPy change
 extern struct _PyInterpreterFrame* _PyEval_GetFrame(void);
 
 extern PyObject* _Py_MakeCoro(PyFunctionObject *func);
+#endif // GraalPy change
 
 #ifdef __cplusplus
 }
diff --git a/graalpython/com.oracle.graal.python.cext/include/internal/pycore_pystate.h b/graalpython/com.oracle.graal.python.cext/include/internal/pycore_pystate.h
@@ -13,7 +13,8 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-// #include "pycore_runtime.h"   /* PyRuntimeState */
+#if 0 // GraalPy change
+#include "pycore_runtime.h"   /* PyRuntimeState */
 
 
 /* Check if the current thread is the main thread.
@@ -80,6 +81,7 @@ _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)
 {
     return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->gilstate.tstate_current);
 }
+#endif // GraalPy change
 
 /* Get the current Python thread state.
 
@@ -97,6 +99,7 @@ _PyThreadState_GET(void)
     return PyThreadState_Get();
 }
 
+#if 0 // GraalPy change
 PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalError_TstateNULL(const char *func);
 
 static inline void
@@ -172,6 +175,7 @@ PyAPI_FUNC(int) _PyState_AddModule(
 
 
 PyAPI_FUNC(int) _PyOS_InterruptOccurred(PyThreadState *tstate);
+#endif // GraalPy change
 
 #ifdef __cplusplus
 }
diff --git a/graalpython/com.oracle.graal.python.cext/src/abstract.c b/graalpython/com.oracle.graal.python.cext/src/abstract.c
@@ -14,8 +14,8 @@
 #include "pycore_object.h"        // _Py_CheckSlotResult()
 #endif // GraalPy change
 #include "pycore_pyerrors.h"      // _PyErr_Occurred()
-#if 0 // GraalPy change
 #include "pycore_pystate.h"       // _PyThreadState_GET()
+#if 0 // GraalPy change
 #include "pycore_unionobject.h"   // _PyUnion_Check()
 #endif // GraalPy change
 #include <ctype.h>
@@ -66,7 +66,7 @@ type_error(const char *msg, PyObject *obj)
 static PyObject *
 null_error(void)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     if (!_PyErr_Occurred(tstate)) {
         _PyErr_SetString(tstate, PyExc_SystemError,
                          "null argument to internal routine");
@@ -1117,7 +1117,6 @@ BINARY_FUNC(PyNumber_Subtract, nb_subtract, "-")
 BINARY_FUNC(PyNumber_Divmod, nb_divmod, "divmod()")
 #endif // GraalPy change
 
-
 PyObject *
 PyNumber_Add(PyObject *v, PyObject *w)
 {
@@ -1449,7 +1448,7 @@ PyNumber_AsSsize_t(PyObject *item, PyObject *err)
     if (result != -1)
         goto finish;
 
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     runerr = _PyErr_Occurred(tstate);
     if (!runerr) {
         goto finish;
diff --git a/graalpython/com.oracle.graal.python.cext/src/call.c b/graalpython/com.oracle.graal.python.cext/src/call.c
@@ -11,9 +11,7 @@
 #endif // GraalPy change
 #include "pycore_object.h"        // _PyObject_GC_TRACK()
 #include "pycore_pyerrors.h"      // _PyErr_Occurred()
-#if 0 // GraalPy change
 #include "pycore_pystate.h"       // _PyThreadState_GET()
-#endif // GraalPy change
 #include "pycore_tuple.h"         // _PyTuple_ITEMS()
 #include "frameobject.h"          // _PyFrame_New_NoTrack()
 
@@ -199,7 +197,7 @@ PyObject *
 PyObject_VectorcallDict(PyObject *callable, PyObject *const *args,
                        size_t nargsf, PyObject *kwargs)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyObject_FastCallDictTstate(tstate, callable, args, nargsf, kwargs);
 }
 
@@ -305,8 +303,7 @@ _PyVectorcall_Call(PyThreadState *tstate, vectorcallfunc func,
 PyObject *
 PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwargs)
 {
-    // GraalPy change: don't get thread state
-    PyThreadState *tstate = NULL;
+    PyThreadState *tstate = _PyThreadState_GET();
 
     /* get vectorcallfunc as in _PyVectorcall_Function, but without
      * the Py_TPFLAGS_HAVE_VECTORCALL check */
@@ -336,7 +333,7 @@ PyObject *
 PyObject_Vectorcall(PyObject *callable, PyObject *const *args,
                      size_t nargsf, PyObject *kwnames)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyObject_VectorcallTstate(tstate, callable,
                                       args, nargsf, kwnames);
 }
@@ -345,7 +342,7 @@ PyObject_Vectorcall(PyObject *callable, PyObject *const *args,
 PyObject *
 _PyObject_FastCall(PyObject *func, PyObject *const *args, Py_ssize_t nargs)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyObject_FastCallTstate(tstate, func, args, nargs);
 }
 
@@ -416,7 +413,7 @@ PyObject_CallOneArg(PyObject *func, PyObject *arg)
     PyObject *_args[2];
     PyObject **args = _args + 1;  // For PY_VECTORCALL_ARGUMENTS_OFFSET
     args[0] = arg;
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
     return _PyObject_VectorcallTstate(tstate, func, args, nargsf, NULL);
 }
@@ -875,8 +872,7 @@ PyObject_VectorcallMethod(PyObject *name, PyObject *const *args,
     assert(args != NULL);
     assert(PyVectorcall_NARGS(nargsf) >= 1);
 
-    // GraalPy change: don't get thread state
-    PyThreadState *tstate = NULL;
+    PyThreadState *tstate = _PyThreadState_GET();
     PyObject *callable = NULL;
     /* Use args[0] as "self" argument */
     int unbound = _PyObject_GetMethod(args[0], name, &callable);
diff --git a/graalpython/com.oracle.graal.python.cext/src/errors.c b/graalpython/com.oracle.graal.python.cext/src/errors.c
@@ -13,8 +13,8 @@
 #include "pycore_initconfig.h"    // _PyStatus_ERR()
 #endif // GraalPy change
 #include "pycore_pyerrors.h"      // _PyErr_Format()
-#if 0 // GraalPy change
 #include "pycore_pystate.h"       // _PyThreadState_GET()
+#if 0 // GraalPy change
 #include "pycore_structseq.h"     // _PyStructSequence_FiniType()
 #include "pycore_sysmodule.h"     // _PySys_Audit()
 #include "pycore_traceback.h"     // _PyTraceBack_FromFrame()
@@ -106,7 +106,7 @@ _PyErr_SetObject(PyThreadState *tstate, PyObject *exception, PyObject *value)
 void
 PyErr_SetObject(PyObject *exception, PyObject *value)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_SetObject(tstate, exception, value);
 }
 
@@ -138,7 +138,7 @@ _PyErr_SetNone(PyThreadState *tstate, PyObject *exception)
 void
 PyErr_SetNone(PyObject *exception)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_SetNone(tstate, exception);
 }
 
@@ -157,7 +157,7 @@ _PyErr_SetString(PyThreadState *tstate, PyObject *exception,
 void
 PyErr_SetString(PyObject *exception, const char *string)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_SetString(tstate, exception, string);
 }
 
@@ -217,7 +217,7 @@ _PyErr_ExceptionMatches(PyThreadState *tstate, PyObject *exc)
 int
 PyErr_ExceptionMatches(PyObject *exc)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyErr_ExceptionMatches(tstate, exc);
 }
 
@@ -245,7 +245,7 @@ _PyErr_NormalizeException(PyThreadState *tstate, PyObject **exc,
 void
 PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_NormalizeException(tstate, exc, val, tb);
 }
 
@@ -275,7 +275,7 @@ _PyErr_Fetch(PyThreadState *tstate, PyObject **p_type, PyObject **p_value,
 void
 PyErr_Fetch(PyObject **p_type, PyObject **p_value, PyObject **p_traceback)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_Fetch(tstate, p_type, p_value, p_traceback);
 }
 
@@ -290,7 +290,7 @@ _PyErr_Clear(PyThreadState *tstate)
 void
 PyErr_Clear(void)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_Clear(tstate);
 }
 
@@ -370,7 +370,7 @@ PyErr_SetHandledException(PyObject *exc)
 void
 PyErr_GetExcInfo(PyObject **p_type, PyObject **p_value, PyObject **p_traceback)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_GetExcInfo(tstate, p_type, p_value, p_traceback);
 }
 
@@ -542,7 +542,7 @@ NO_INLINE // GraalPy change: disallow bitcode inlining
 PyObject *
 _PyErr_FormatFromCause(PyObject *exception, const char *format, ...)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     va_list vargs;
 #ifdef HAVE_STDARG_PROTOTYPES
     va_start(vargs, format);
@@ -559,7 +559,7 @@ _PyErr_FormatFromCause(PyObject *exception, const char *format, ...)
 int
 PyErr_BadArgument(void)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_SetString(tstate, PyExc_TypeError,
                      "bad argument type for built-in operation");
     return 0;
@@ -583,7 +583,7 @@ _PyErr_NoMemory(PyThreadState *tstate)
 PyObject *
 PyErr_NoMemory(void)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyErr_NoMemory(tstate);
 }
 
@@ -596,7 +596,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
 PyObject *
 PyErr_SetFromErrnoWithFilenameObjects(PyObject *exc, PyObject *filenameObject, PyObject *filenameObject2)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     PyObject *message;
     PyObject *v, *args;
     int i = errno;
@@ -865,7 +865,7 @@ PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path)
 void
 _PyErr_BadInternalCall(const char *filename, int lineno)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_Format(tstate, PyExc_SystemError,
                   "%s:%d: bad argument to internal function",
                   filename, lineno);
@@ -878,7 +878,7 @@ void
 PyErr_BadInternalCall(void)
 {
     assert(0 && "bad argument to internal function");
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     _PyErr_SetString(tstate, PyExc_SystemError,
                      "bad argument to internal function");
 }
@@ -907,7 +907,7 @@ _PyErr_FormatV(PyThreadState *tstate, PyObject *exception,
 PyObject *
 PyErr_FormatV(PyObject *exception, const char *format, va_list vargs)
 {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyErr_FormatV(tstate, exception, format, vargs);
 }
 
@@ -933,7 +933,7 @@ NO_INLINE // GraalPy change: disallow bitcode inlining
 PyObject *
 PyErr_Format(PyObject *exception, const char *format, ...)
 {
-    PyThreadState *tstate = NULL; // GrallPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     va_list vargs;
 #ifdef HAVE_STDARG_PROTOTYPES
     va_start(vargs, format);
diff --git a/graalpython/com.oracle.graal.python.cext/src/object.c b/graalpython/com.oracle.graal.python.cext/src/object.c

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ extern "C" {`
`13`	`13`	`# error "this header requires Py_BUILD_CORE define"`
`14`	`14`	`#endif`
`15`	`15`
`16`		`-// #include "pycore_runtime.h" /* PyRuntimeState */`
	`16`	`+#if 0 // GraalPy change`
	`17`	`+#include "pycore_runtime.h" /* PyRuntimeState */`
`17`	`18`
`18`	`19`
`19`	`20`	`/* Check if the current thread is the main thread.`
`@@ -80,6 +81,7 @@ _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)`
`80`	`81`	`{`
`81`	`82`	`return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->gilstate.tstate_current);`
`82`	`83`	`}`
	`84`	`+#endif // GraalPy change`
`83`	`85`
`84`	`86`	`/* Get the current Python thread state.`
`85`	`87`
`@@ -97,6 +99,7 @@ _PyThreadState_GET(void)`
`97`	`99`	`return PyThreadState_Get();`
`98`	`100`	`}`
`99`	`101`
	`102`	`+#if 0 // GraalPy change`
`100`	`103`	`PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalError_TstateNULL(const char *func);`
`101`	`104`
`102`	`105`	`static inline void`
`@@ -172,6 +175,7 @@ PyAPI_FUNC(int) _PyState_AddModule(`
`172`	`175`
`173`	`176`
`174`	`177`	`PyAPI_FUNC(int) _PyOS_InterruptOccurred(PyThreadState *tstate);`
	`178`	`+#endif // GraalPy change`
`175`	`179`
`176`	`180`	`#ifdef __cplusplus`
`177`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`#include "pycore_initconfig.h" // _PyStatus_ERR()`
`14`	`14`	`#endif // GraalPy change`
`15`	`15`	`#include "pycore_pyerrors.h" // _PyErr_Format()`
`16`		`-#if 0 // GraalPy change`
`17`	`16`	`#include "pycore_pystate.h" // _PyThreadState_GET()`
	`17`	`+#if 0 // GraalPy change`
`18`	`18`	`#include "pycore_structseq.h" // _PyStructSequence_FiniType()`
`19`	`19`	`#include "pycore_sysmodule.h" // _PySys_Audit()`
`20`	`20`	`#include "pycore_traceback.h" // _PyTraceBack_FromFrame()`
`@@ -106,7 +106,7 @@ _PyErr_SetObject(PyThreadState tstate, PyObject exception, PyObject *value)`
`106`	`106`	`void`
`107`	`107`	`PyErr_SetObject(PyObject exception, PyObject value)`
`108`	`108`	`{`
`109`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`109`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`110`	`110`	`_PyErr_SetObject(tstate, exception, value);`
`111`	`111`	`}`
`112`	`112`
`@@ -138,7 +138,7 @@ _PyErr_SetNone(PyThreadState tstate, PyObject exception)`
`138`	`138`	`void`
`139`	`139`	`PyErr_SetNone(PyObject *exception)`
`140`	`140`	`{`
`141`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`141`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`142`	`142`	`_PyErr_SetNone(tstate, exception);`
`143`	`143`	`}`
`144`	`144`
`@@ -157,7 +157,7 @@ _PyErr_SetString(PyThreadState tstate, PyObject exception,`
`157`	`157`	`void`
`158`	`158`	`PyErr_SetString(PyObject exception, const char string)`
`159`	`159`	`{`
`160`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`160`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`161`	`161`	`_PyErr_SetString(tstate, exception, string);`
`162`	`162`	`}`
`163`	`163`
`@@ -217,7 +217,7 @@ _PyErr_ExceptionMatches(PyThreadState tstate, PyObject exc)`
`217`	`217`	`int`
`218`	`218`	`PyErr_ExceptionMatches(PyObject *exc)`
`219`	`219`	`{`
`220`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`220`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`221`	`221`	`return _PyErr_ExceptionMatches(tstate, exc);`
`222`	`222`	`}`
`223`	`223`
`@@ -245,7 +245,7 @@ _PyErr_NormalizeException(PyThreadState tstate, PyObject *exc,`
`245`	`245`	`void`
`246`	`246`	`PyErr_NormalizeException(PyObject exc, PyObject val, PyObject **tb)`
`247`	`247`	`{`
`248`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`248`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`249`	`249`	`_PyErr_NormalizeException(tstate, exc, val, tb);`
`250`	`250`	`}`
`251`	`251`
`@@ -275,7 +275,7 @@ _PyErr_Fetch(PyThreadState tstate, PyObject p_type, PyObject *p_value,`
`275`	`275`	`void`
`276`	`276`	`PyErr_Fetch(PyObject p_type, PyObject p_value, PyObject **p_traceback)`
`277`	`277`	`{`
`278`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`278`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`279`	`279`	`_PyErr_Fetch(tstate, p_type, p_value, p_traceback);`
`280`	`280`	`}`
`281`	`281`
`@@ -290,7 +290,7 @@ _PyErr_Clear(PyThreadState *tstate)`
`290`	`290`	`void`
`291`	`291`	`PyErr_Clear(void)`
`292`	`292`	`{`
`293`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`293`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`294`	`294`	`_PyErr_Clear(tstate);`
`295`	`295`	`}`
`296`	`296`
`@@ -370,7 +370,7 @@ PyErr_SetHandledException(PyObject *exc)`
`370`	`370`	`void`
`371`	`371`	`PyErr_GetExcInfo(PyObject p_type, PyObject p_value, PyObject **p_traceback)`
`372`	`372`	`{`
`373`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`373`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`374`	`374`	`_PyErr_GetExcInfo(tstate, p_type, p_value, p_traceback);`
`375`	`375`	`}`
`376`	`376`
`@@ -542,7 +542,7 @@ NO_INLINE // GraalPy change: disallow bitcode inlining`
`542`	`542`	`PyObject *`
`543`	`543`	`_PyErr_FormatFromCause(PyObject exception, const char format, ...)`
`544`	`544`	`{`
`545`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`545`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`546`	`546`	`va_list vargs;`
`547`	`547`	`#ifdef HAVE_STDARG_PROTOTYPES`
`548`	`548`	`va_start(vargs, format);`
`@@ -559,7 +559,7 @@ _PyErr_FormatFromCause(PyObject exception, const char format, ...)`
`559`	`559`	`int`
`560`	`560`	`PyErr_BadArgument(void)`
`561`	`561`	`{`
`562`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`562`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`563`	`563`	`_PyErr_SetString(tstate, PyExc_TypeError,`
`564`	`564`	`"bad argument type for built-in operation");`
`565`	`565`	`return 0;`
`@@ -583,7 +583,7 @@ _PyErr_NoMemory(PyThreadState *tstate)`
`583`	`583`	`PyObject *`
`584`	`584`	`PyErr_NoMemory(void)`
`585`	`585`	`{`
`586`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`586`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`587`	`587`	`return _PyErr_NoMemory(tstate);`
`588`	`588`	`}`
`589`	`589`
`@@ -596,7 +596,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject exc, PyObject filenameObject)`
`596`	`596`	`PyObject *`
`597`	`597`	`PyErr_SetFromErrnoWithFilenameObjects(PyObject exc, PyObject filenameObject, PyObject *filenameObject2)`
`598`	`598`	`{`
`599`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`599`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`600`	`600`	`PyObject *message;`
`601`	`601`	`PyObject v, args;`
`602`	`602`	`int i = errno;`
`@@ -865,7 +865,7 @@ PyErr_SetImportError(PyObject msg, PyObject name, PyObject *path)`
`865`	`865`	`void`
`866`	`866`	`_PyErr_BadInternalCall(const char *filename, int lineno)`
`867`	`867`	`{`
`868`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`868`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`869`	`869`	`_PyErr_Format(tstate, PyExc_SystemError,`
`870`	`870`	`"%s:%d: bad argument to internal function",`
`871`	`871`	`filename, lineno);`
`@@ -878,7 +878,7 @@ void`
`878`	`878`	`PyErr_BadInternalCall(void)`
`879`	`879`	`{`
`880`	`880`	`assert(0 && "bad argument to internal function");`
`881`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`881`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`882`	`882`	`_PyErr_SetString(tstate, PyExc_SystemError,`
`883`	`883`	`"bad argument to internal function");`
`884`	`884`	`}`
`@@ -907,7 +907,7 @@ _PyErr_FormatV(PyThreadState tstate, PyObject exception,`
`907`	`907`	`PyObject *`
`908`	`908`	`PyErr_FormatV(PyObject exception, const char format, va_list vargs)`
`909`	`909`	`{`
`910`		`- PyThreadState *tstate = NULL; // GraalPy change: don't get thread state`
	`910`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`911`	`911`	`return _PyErr_FormatV(tstate, exception, format, vargs);`
`912`	`912`	`}`
`913`	`913`
`@@ -933,7 +933,7 @@ NO_INLINE // GraalPy change: disallow bitcode inlining`
`933`	`933`	`PyObject *`
`934`	`934`	`PyErr_Format(PyObject exception, const char format, ...)`
`935`	`935`	`{`
`936`		`- PyThreadState *tstate = NULL; // GrallPy change: don't get thread state`
	`936`	`+ PyThreadState *tstate = _PyThreadState_GET();`
`937`	`937`	`va_list vargs;`
`938`	`938`	`#ifdef HAVE_STDARG_PROTOTYPES`
`939`	`939`	`va_start(vargs, format);`