mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 18:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

gh-130312: SET_ADD should not lock (#130136)

Browse source 
SET_ADD should not lock
This commit is contained in:
Dino Viehland 2025-03-21 15:58:32 -07:00 • committed by GitHub
parent 7101cba6bf
commit d9411ae3c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 76 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Python/bytecodes.c
View file

@ -975,9 +975,8 @@ dummy_func(
}
inst(SET_ADD, (set, unused[oparg-1], v -- set, unused[oparg-1])) {
int err = PySet_Add(PyStackRef_AsPyObjectBorrow(set),
PyStackRef_AsPyObjectBorrow(v));
PyStackRef_CLOSE(v);
int err = _PySet_AddTakeRef((PySetObject *)PyStackRef_AsPyObjectBorrow(set),
PyStackRef_AsPyObjectSteal(v));
ERROR_IF(err, error);
}
@ -1916,17 +1915,24 @@ dummy_func(
DECREF_INPUTS();
ERROR_IF(true, error);
}
int err = 0;
for (int i = 0; i < oparg; i++) {
for (Py_ssize_t i = 0; i < oparg; i++) {
_PyStackRef value = values[i];
values[i] = PyStackRef_NULL;
if (err == 0) {
err = PySet_Add(set_o, PyStackRef_AsPyObjectBorrow(values[i]));
err = _PySet_AddTakeRef((PySetObject *)set_o, PyStackRef_AsPyObjectSteal(value));
}
else {
PyStackRef_CLOSE(value);
}
}
DECREF_INPUTS();
if (err != 0) {
if (err) {
Py_DECREF(set_o);
ERROR_IF(true, error);
}
INPUTS_DEAD();
set = PyStackRef_FromPyObjectStealMortal(set_o);
}