Skip to content

Commit c725383

Browse files
committed
Simple readability/redundancy quirk.
1 parent 513d011 commit c725383

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Objects/unicodeobject.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15984,14 +15984,16 @@ intern_common(PyInterpreterState *interp, PyObject *s /* stolen */,
1598415984
/* Do a setdefault on the per-interpreter cache. */
1598515985
PyObject *interned = get_interned_dict(interp);
1598615986
assert(interned != NULL);
15987-
15988-
FT_MUTEX_LOCK(&_Py_INTERP_CACHED_OBJECT(interp, interned_mutex));
15987+
#ifdef Py_GIL_DISABLED
15988+
# define INTERN_MUTEX &_Py_INTERP_CACHED_OBJECT(interp, interned_mutex)
15989+
#endif
15990+
FT_MUTEX_LOCK(INTERN_MUTEX);
1598915991
PyObject *t;
1599015992
{
1599115993
int res = PyDict_SetDefaultRef(interned, s, s, &t);
1599215994
if (res < 0) {
1599315995
PyErr_Clear();
15994-
FT_MUTEX_UNLOCK(&_Py_INTERP_CACHED_OBJECT(interp, interned_mutex));
15996+
FT_MUTEX_UNLOCK(INTERN_MUTEX);
1599515997
return s;
1599615998
}
1599715999
else if (res == 1) {
@@ -16001,7 +16003,7 @@ intern_common(PyInterpreterState *interp, PyObject *s /* stolen */,
1600116003
PyUnicode_CHECK_INTERNED(t) == SSTATE_INTERNED_MORTAL) {
1600216004
immortalize_interned(t);
1600316005
}
16004-
FT_MUTEX_UNLOCK(&_Py_INTERP_CACHED_OBJECT(interp, interned_mutex));
16006+
FT_MUTEX_UNLOCK(INTERN_MUTEX);
1600516007
return t;
1600616008
}
1600716009
else {
@@ -16034,7 +16036,7 @@ intern_common(PyInterpreterState *interp, PyObject *s /* stolen */,
1603416036
immortalize_interned(s);
1603516037
}
1603616038

16037-
FT_MUTEX_UNLOCK(&_Py_INTERP_CACHED_OBJECT(interp, interned_mutex));
16039+
FT_MUTEX_UNLOCK(INTERN_MUTEX);
1603816040
return s;
1603916041
}
1604016042

0 commit comments

Comments
 (0)