Improve readability and fix warning.

ZeroIntensity · ZeroIntensity · commit 767c8940efac · 2026-05-04T19:39:14.000-04:00
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -3487,7 +3487,7 @@ PyInterpreterView_FromMain(void)
 
 static const PyThreadStateToken *_no_tstate_sentinel = (const PyThreadStateToken *)&_no_tstate_sentinel;
 
-#define NO_TSTATE_SENTINEL (_no_tstate_sentinel)
+#define NO_TSTATE_SENTINEL ((PyThreadStateToken *)_no_tstate_sentinel)
 
 PyThreadStateToken *
 PyThreadState_Ensure(PyInterpreterGuard *guard)
@@ -3521,10 +3521,9 @@ PyThreadState_Ensure(PyInterpreterGuard *guard)
 
     if (attached_tstate != NULL) {
         return (PyThreadStateToken*)PyThreadState_Swap(fresh_tstate);
-    } else {
-        _PyThreadState_Attach(fresh_tstate);
     }
 
+    _PyThreadState_Attach(fresh_tstate);
     return NO_TSTATE_SENTINEL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3487,7 +3487,7 @@ PyInterpreterView_FromMain(void)`
`3487`	`3487`
`3488`	`3488`	`static const PyThreadStateToken _no_tstate_sentinel = (const PyThreadStateToken )&_no_tstate_sentinel;`
`3489`	`3489`
`3490`		`-#define NO_TSTATE_SENTINEL (_no_tstate_sentinel)`
	`3490`	`+#define NO_TSTATE_SENTINEL ((PyThreadStateToken *)_no_tstate_sentinel)`
`3491`	`3491`
`3492`	`3492`	`PyThreadStateToken *`
`3493`	`3493`	`PyThreadState_Ensure(PyInterpreterGuard *guard)`
`@@ -3521,10 +3521,9 @@ PyThreadState_Ensure(PyInterpreterGuard *guard)`
`3521`	`3521`
`3522`	`3522`	`if (attached_tstate != NULL) {`
`3523`	`3523`	`return (PyThreadStateToken*)PyThreadState_Swap(fresh_tstate);`
`3524`		`- } else {`
`3525`		`- _PyThreadState_Attach(fresh_tstate);`
`3526`	`3524`	`}`
`3527`	`3525`
	`3526`	`+ _PyThreadState_Attach(fresh_tstate);`
`3528`	`3527`	`return NO_TSTATE_SENTINEL;`
`3529`	`3528`	`}`
`3530`	`3529`