@@ -147,9 +147,7 @@ it's USABLE_FRACTION (currently two-thirds) full.
147
147
static inline void
148
148
ASSERT_DICT_LOCKED (PyObject * op )
149
149
{
150
- if (Py_REFCNT (op ) != 1 ) {
151
- _Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED (op );
152
- }
150
+ _Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED (op );
153
151
}
154
152
#define ASSERT_DICT_LOCKED (op ) ASSERT_DICT_LOCKED(_Py_CAST(PyObject*, op))
155
153
@@ -1987,7 +1985,8 @@ _PyDict_SetItem_KnownHash(PyObject *op, PyObject *key, PyObject *value,
1987
1985
1988
1986
if (mp -> ma_keys == Py_EMPTY_KEYS ) {
1989
1987
res = insert_to_emptydict (interp , mp , Py_NewRef (key ), hash , Py_NewRef (value ));
1990
- } else {
1988
+ }
1989
+ else {
1991
1990
/* insertdict() handles any resizing that might be necessary */
1992
1991
res = insertdict (interp , mp , Py_NewRef (key ), hash , Py_NewRef (value ));
1993
1992
}
@@ -2521,7 +2520,8 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
2521
2520
d = (PyObject * )dict_dict_fromkeys (interp , mp , iterable , value );
2522
2521
Py_END_CRITICAL_SECTION2 ();
2523
2522
return d ;
2524
- } else if (PyAnySet_CheckExact (iterable )) {
2523
+ }
2524
+ else if (PyAnySet_CheckExact (iterable )) {
2525
2525
PyDictObject * mp = (PyDictObject * )d ;
2526
2526
2527
2527
Py_BEGIN_CRITICAL_SECTION2 (d , iterable );
@@ -2874,7 +2874,6 @@ PyDict_Values(PyObject *dict)
2874
2874
Py_BEGIN_CRITICAL_SECTION (dict );
2875
2875
res = values_lock_held (dict );
2876
2876
Py_END_CRITICAL_SECTION ();
2877
-
2878
2877
return res ;
2879
2878
}
2880
2879
@@ -3732,11 +3731,9 @@ PyObject *
3732
3731
PyDict_SetDefault (PyObject * d , PyObject * key , PyObject * defaultobj )
3733
3732
{
3734
3733
PyObject * res ;
3735
-
3736
3734
Py_BEGIN_CRITICAL_SECTION (d );
3737
3735
res = setdefault_lock_held (d , key , defaultobj );
3738
3736
Py_END_CRITICAL_SECTION ();
3739
-
3740
3737
return res ;
3741
3738
}
3742
3739
@@ -4089,7 +4086,6 @@ PyDict_Contains(PyObject *op, PyObject *key)
4089
4086
Py_BEGIN_CRITICAL_SECTION (op );
4090
4087
res = contains_lock_held ((PyDictObject * )op , key );
4091
4088
Py_END_CRITICAL_SECTION ();
4092
-
4093
4089
return res ;
4094
4090
}
4095
4091
0 commit comments