Remove duplicate code for fast access to PyThreadState.

ee80beea · Stefan Behnel · a656e097 · ee80beea · ee80beea
Commit ee80beea authored Sep 25, 2017 by Stefan Behnel
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 11 deletions

Cython/Utility/Exceptions.c Cython/Utility/Exceptions.c +1 -10

Cython/Utility/ModuleSetupCode.c Cython/Utility/ModuleSetupCode.c +2 -1

No files found.
--- a/Cython/Utility/Exceptions.c
+++ b/Cython/Utility/Exceptions.c
@@ -11,17 +11,8 @@
 #if CYTHON_FAST_THREAD_STATE
 #define __Pyx_PyThreadState_declare  PyThreadState *$local_tstate_cname;
+#define __Pyx_PyThreadState_assign  $local_tstate_cname = __Pyx_PyThreadState_Current;
 #define __Pyx_PyErr_Occurred()  $local_tstate_cname->curexc_type
-#if PY_VERSION_HEX >= 0x03060000
-  // Actually added in 3.5.2, but compiling against that does not guarantee that we get imported there.
-  #define __Pyx_PyThreadState_assign  $local_tstate_cname = _PyThreadState_UncheckedGet();
-#elif PY_VERSION_HEX >= 0x03000000
-  #define __Pyx_PyThreadState_assign  $local_tstate_cname = PyThreadState_GET();
-#elif PY_VERSION_HEX >= 0x02070000
-  #define __Pyx_PyThreadState_assign  $local_tstate_cname = _PyThreadState_Current;
-#else
-  #define __Pyx_PyThreadState_assign  $local_tstate_cname = PyThreadState_GET();
-#endif
 #else
 #define __Pyx_PyThreadState_declare
 #define __Pyx_PyThreadState_assign

--- a/Cython/Utility/ModuleSetupCode.c
+++ b/Cython/Utility/ModuleSetupCode.c
@@ -248,7 +248,8 @@
 #if !CYTHON_FAST_THREAD_STATE || PY_VERSION_HEX < 0x02070000
  #define __Pyx_PyThreadState_Current PyThreadState_GET()
 #if PY_VERSION_HEX >= 0x03060000
-//#elif PY_VERSION_HEX >= 0x03050200
+  //#elif PY_VERSION_HEX >= 0x03050200
+  // Actually added in 3.5.2, but compiling against that does not guarantee that we get imported there.
  #define __Pyx_PyThreadState_Current _PyThreadState_UncheckedGet()
 #elif PY_VERSION_HEX >= 0x03000000
  #define __Pyx_PyThreadState_Current PyThreadState_GET()