Use _Py_AcquireGlobalObjectsState() in store_interned().

Author: ericsnowcurrently

Include/internal/pycore_pystate.h

@@ -121,9 +121,7 @@ static inline PyInterpreterState* _PyInterpreterState_GET(void) {
 // PyThreadState functions
 
 PyAPI_FUNC(PyThreadState *) _PyThreadState_New(PyInterpreterState *interp);
-PyAPI_FUNC(int) _PyThreadState_IsBound(PyThreadState *tstate);
 PyAPI_FUNC(void) _PyThreadState_Bind(PyThreadState *tstate);
-PyAPI_FUNC(void) _PyThreadState_Unbind(PyThreadState *tstate);
 // We keep this around exclusively for stable ABI compatibility.
 PyAPI_FUNC(void) _PyThreadState_Init(
     PyThreadState *tstate);

Objects/unicodeobject.c

@@ -14585,41 +14585,26 @@ _PyUnicode_InitTypes(PyInterpreterState *interp)
 }
 
 
-static PyThreadState *
-get_interned_tstate(void)
-{
-    return &_PyRuntime.cached_objects.main_tstate;
-}
-
 static inline PyObject *
 store_interned(PyObject *obj)
 {
     PyObject *interned = get_interned_dict();
     assert(interned != NULL);
 
     /* Swap to the main interpreter, if necessary. */
-    PyThreadState *oldts = NULL;
-    if (!_Py_IsMainInterpreter(_PyInterpreterState_GET())) {
-        PyThreadState *main_tstate = get_interned_tstate();
-        int bound = _PyThreadState_IsBound(main_tstate);
-        if (!bound) {
-            _PyThreadState_Bind(main_tstate);
-        }
-        oldts = PyThreadState_Swap(main_tstate);
-        assert(oldts != NULL);
-        if (!bound) {
-            _PyThreadState_Unbind(main_tstate);
-        }
-    }
+    PyInterpreterState *interp = _PyInterpreterState_GET();
+    PyThreadState *oldts = _Py_AcquireGlobalObjectsState(interp);
 
+    /* This might trigger a resize, which is why we must "acquire"
+       the global object state. */
     PyObject *t = PyDict_SetDefault(interned, obj, obj);
     if (t == NULL) {
         PyErr_Clear();
     }
 
     /* Swap back. */
     if (oldts != NULL) {
-        PyThreadState_Swap(oldts);
+        _Py_ReleaseGlobalObjectsState(oldts);
     }
 
     return t;

Python/pystate.c

@@ -1923,12 +1923,6 @@ PyThreadState_Swap(PyThreadState *newts)
 }
 
 
-int
-_PyThreadState_IsBound(PyThreadState *tstate)
-{
-    return tstate_is_bound(tstate);
-}
-
 void
 _PyThreadState_Bind(PyThreadState *tstate)
 {
@@ -1940,14 +1934,6 @@ _PyThreadState_Bind(PyThreadState *tstate)
     }
 }
 
-void
-_PyThreadState_Unbind(PyThreadState *tstate)
-{
-    /* For now, we do not allow the initial tstate to be unbound. */
-    assert(gilstate_tss_get(tstate->interp->runtime) != tstate);
-    unbind_tstate(tstate);
-}
-
 
 /***********************************/
 /* routines for advanced debuggers */