From: Yury Selivanov <yury@magic.io>
Date: Sat, 27 Jan 2018 18:24:20 +0000 (-0500)
Subject: bpo-32436: Use PyThreadState_GET() in all hot paths (GH-5363)
X-Git-Tag: v3.7.0b1~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc4123b0b380edda774b8bff2fa1bcc96453b440;p=thirdparty%2FPython%2Fcpython.git

bpo-32436: Use PyThreadState_GET() in all hot paths (GH-5363)
---

diff --git a/Python/context.c b/Python/context.c
index 3928e94d0645..2034a2041215 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();