gh-110481: Fix _Py_ThreadId for non-free-threaded mode (gh-111503)

corona10 · web-flow · commit 55df2deb1aeb · 2023-10-31T02:16:18.000+09:00
diff --git a/Include/object.h b/Include/object.h
@@ -231,7 +231,7 @@ typedef struct {
 PyAPI_FUNC(int) Py_Is(PyObject *x, PyObject *y);
 #define Py_Is(x, y) ((x) == (y))
 
-#ifndef Py_LIMITED_API
+#if defined(Py_NOGIL) && !defined(Py_LIMITED_API)
 static inline uintptr_t
 _Py_ThreadId(void)
 {
@@ -259,9 +259,7 @@ _Py_ThreadId(void)
 #endif
   return tid;
 }
-#endif
 
-#if defined(Py_NOGIL) && !defined(Py_LIMITED_API)
 static inline Py_ALWAYS_INLINE int
 _Py_IsOwnedByCurrentThread(PyObject *ob)
 {

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ typedef struct {`
`231`	`231`	`PyAPI_FUNC(int) Py_Is(PyObject x, PyObject y);`
`232`	`232`	`#define Py_Is(x, y) ((x) == (y))`
`233`	`233`
`234`		`-#ifndef Py_LIMITED_API`
	`234`	`+#if defined(Py_NOGIL) && !defined(Py_LIMITED_API)`
`235`	`235`	`static inline uintptr_t`
`236`	`236`	`_Py_ThreadId(void)`
`237`	`237`	`{`
`@@ -259,9 +259,7 @@ _Py_ThreadId(void)`
`259`	`259`	`#endif`
`260`	`260`	`return tid;`
`261`	`261`	`}`
`262`		`-#endif`
`263`	`262`
`264`		`-#if defined(Py_NOGIL) && !defined(Py_LIMITED_API)`
`265`	`263`	`static inline Py_ALWAYS_INLINE int`
`266`	`264`	`_Py_IsOwnedByCurrentThread(PyObject *ob)`
`267`	`265`	`{`