Drop has_own_refchain() calls where not needed.

ericsnowcurrently · Oct 21, 2024 · ffe2633 · ffe2633
1 parent 203c112
commit ffe2633
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/Objects/object.c b/Objects/object.c
@@ -215,19 +215,13 @@ refchain_fini(PyInterpreterState *interp)
 bool
 _PyRefchain_IsTraced(PyInterpreterState *interp, PyObject *obj)
 {
-    if (!has_own_refchain(interp)) {
-        interp = _PyInterpreterState_Main();
-    }
     return (_Py_hashtable_get(REFCHAIN(interp), obj) == REFCHAIN_VALUE);
 }
 
 
 static void
 _PyRefchain_Trace(PyInterpreterState *interp, PyObject *obj)
 {
-    if (!has_own_refchain(interp)) {
-        interp = _PyInterpreterState_Main();
-    }
     if (_Py_hashtable_set(REFCHAIN(interp), obj, REFCHAIN_VALUE) < 0) {
         // Use a fatal error because _Py_NewReference() cannot report
         // the error to the caller.
@@ -239,9 +233,6 @@ _PyRefchain_Trace(PyInterpreterState *interp, PyObject *obj)
 static void
 _PyRefchain_Remove(PyInterpreterState *interp, PyObject *obj)
 {
-    if (!has_own_refchain(interp)) {
-        interp = _PyInterpreterState_Main();
-    }
     void *value = _Py_hashtable_steal(REFCHAIN(interp), obj);
 #ifndef NDEBUG
     assert(value == REFCHAIN_VALUE);
@@ -2587,9 +2578,6 @@ _Py_PrintReferences(PyInterpreterState *interp, FILE *fp)
         interp = _PyInterpreterState_Main();
     }
     fprintf(fp, "Remaining objects:\n");
-    if (!has_own_refchain(interp)) {
-        interp = _PyInterpreterState_Main();
-    }
     _Py_hashtable_foreach(REFCHAIN(interp), _Py_PrintReference, fp);
 }
 
@@ -2618,9 +2606,6 @@ void
 _Py_PrintReferenceAddresses(PyInterpreterState *interp, FILE *fp)
 {
     fprintf(fp, "Remaining object addresses:\n");
-    if (!has_own_refchain(interp)) {
-        interp = _PyInterpreterState_Main();
-    }
     _Py_hashtable_foreach(REFCHAIN(interp), _Py_PrintReferenceAddress, fp);
 }
 
@@ -2700,9 +2685,6 @@ _Py_GetObjects(PyObject *self, PyObject *args)
         .limit = limit,
     };
     PyInterpreterState *interp = _PyInterpreterState_GET();
-    if (!has_own_refchain(interp)) {
-        interp = _PyInterpreterState_Main();
-    }
     int res = _Py_hashtable_foreach(REFCHAIN(interp), _Py_GetObject, &data);
     if (res == _PY_GETOBJECTS_ERROR) {
         Py_DECREF(list);