From bc4123b0b380edda774b8bff2fa1bcc96453b440 Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Sat, 27 Jan 2018 13:24:20 -0500 Subject: [PATCH] bpo-32436: Use PyThreadState_GET() in all hot paths (GH-5363) --- Python/context.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Python/context.c b/Python/context.c index 3928e94d06..2034a20412 100644 --- a/Python/context.c +++ b/Python/context.c @@ -85,7 +85,8 @@ PyContext_Enter(PyContext *ctx) return -1; } - PyThreadState *ts = PyThreadState_Get(); + PyThreadState *ts = PyThreadState_GET(); + assert(ts != NULL); ctx->ctx_prev = (PyContext *)ts->context; /* borrow */ ctx->ctx_entered = 1; @@ -107,7 +108,8 @@ PyContext_Exit(PyContext *ctx) return -1; } - PyThreadState *ts = PyThreadState_Get(); + PyThreadState *ts = PyThreadState_GET(); + assert(ts != NULL); if (ts->context != (PyObject *)ctx) { /* Can only happen if someone misuses the C API */ @@ -341,7 +343,8 @@ context_new_from_vars(PyHamtObject *vars) static inline PyContext * context_get(void) { - PyThreadState *ts = PyThreadState_Get(); + PyThreadState *ts = PyThreadState_GET(); + assert(ts != NULL); PyContext *current_ctx = (PyContext *)ts->context; if (current_ctx == NULL) { current_ctx = context_new_empty(); -- 2.40.0