FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.15] gh-152235: Defer GC tracking in set.union and set.difference (gh-152290) by corona10 · Pull Request #152316 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

[3.15] gh-152235: Defer GC tracking in set.union and set.difference (gh-152290) #152316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corona10 merged 1 commit into from
Jun 26, 2026
Conversation 0 Commits 1 Checks 54 Files changed
Merged

[3.15] gh-152235: Defer GC tracking in set.union and set.difference (gh-152290) #152316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .c  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
5 changes: 3 additions & 2 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-22-03-16.gh-issue-152235.ZKWiWk.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Defer GC tracking of :meth:`set.intersection`, :meth:`set.difference` and
:meth:`set.symmetric_difference`. Patch by Donghee Na.
Defer GC tracking of :meth:`set.intersection`, :meth:`set.difference`,
:meth:`set.symmetric_difference`, :meth:`set.union` and ``set.__sub__``.
Patch by Donghee Na.
50 changes: 32 additions & 18 deletions Objects/setobject.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1567,6 +1567,21 @@ set_swap_bodies(PySetObject *a, PySetObject *b)
FT_ATOMIC_STORE_PTR_RELEASE(b->table, b_table);
}

static PyObject *
set_copy_untracked_lock_held(PySetObject *so)
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(so);
PyObject *copy = make_new_set_basetype_untracked(Py_TYPE(so), NULL);
if (copy == NULL) {
return NULL;
}
if (set_merge_lock_held((PySetObject *)copy, (PyObject *)so) < 0) {
Py_DECREF(copy);
return NULL;
}
return copy;
}

/*[clinic input]
@critical_section
set.copy
Expand All @@ -1579,14 +1594,9 @@ static PyObject *
set_copy_impl(PySetObject *so)
/*[clinic end generated code: output=c9223a1e1cc6b041 input=c169a4fbb8209257]*/
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(so);
PyObject *copy = make_new_set_basetype(Py_TYPE(so), NULL);
if (copy == NULL) {
return NULL;
}
if (set_merge_lock_held((PySetObject *)copy, (PyObject *)so) < 0) {
Py_DECREF(copy);
return NULL;
PyObject *copy = set_copy_untracked_lock_held(so);
if (copy != NULL) {
_PyObject_GC_TRACK(copy);
}
return copy;
}
Expand Down Expand Up @@ -1642,7 +1652,8 @@ set_union_impl(PySetObject *so, PyObject * const *others,
PyObject *other;
Py_ssize_t i;

result = (PySetObject *)set_copy((PyObject *)so, NULL);
result = (PySetObject *)make_new_set_basetype_untracked(Py_TYPE(so),
(PyObject *)so);
if (result == NULL)
return NULL;

Expand All @@ -1655,6 +1666,7 @@ set_union_impl(PySetObject *so, PyObject * const *others,
return NULL;
}
}
_PyObject_GC_TRACK(result);
return (PyObject *)result;
}

Expand Down Expand Up @@ -2045,11 +2057,11 @@ set_difference_update_impl(PySetObject *so, PyObject * const *others,
}

static PyObject *
set_copy_and_difference(PySetObject *so, PyObject *other)
set_copy_and_difference_untracked(PySetObject *so, PyObject *other)
{
PyObject *result;

result = set_copy_impl(so);
result = set_copy_untracked_lock_held(so);
if (result == NULL)
return NULL;
if (set_difference_update_internal((PySetObject *) result, other) == 0)
Expand All @@ -2059,7 +2071,7 @@ set_copy_and_difference(PySetObject *so, PyObject *other)
}

static PyObject *
set_difference(PySetObject *so, PyObject *other)
set_difference_untracked(PySetObject *so, PyObject *other)
{
PyObject *result;
PyObject *key;
Expand All @@ -2075,13 +2087,13 @@ set_difference(PySetObject *so, PyObject *other)
other_size = PyDict_GET_SIZE(other);
}
else {
return set_copy_and_difference(so, other);
return set_copy_and_difference_untracked(so, other);
}

/* If len(so) much more than len(other), it's more efficient to simply copy
* so and then iterate other looking for common elements. */
if ((PySet_GET_SIZE(so) >> 2) > other_size) {
return set_copy_and_difference(so, other);
return set_copy_and_difference_untracked(so, other);
}

result = make_new_set_basetype_untracked(Py_TYPE(so), NULL);
Expand All @@ -2108,7 +2120,6 @@ set_difference(PySetObject *so, PyObject *other)
}
Py_DECREF(key);
}
_PyObject_GC_TRACK(result);
return result;
}

Expand All @@ -2132,7 +2143,6 @@ set_difference(PySetObject *so, PyObject *other)
}
Py_DECREF(key);
}
_PyObject_GC_TRACK(result);
return result;
}

Expand All @@ -2159,7 +2169,7 @@ set_difference_multi_impl(PySetObject *so, PyObject * const *others,

other = others[0];
Py_BEGIN_CRITICAL_SECTION2(so, other);
result = set_difference(so, other);
result = set_difference_untracked(so, other);
Py_END_CRITICAL_SECTION2();
if (result == NULL)
return NULL;
Expand All @@ -2175,6 +2185,7 @@ set_difference_multi_impl(PySetObject *so, PyObject * const *others,
return NULL;
}
}
_PyObject_GC_TRACK(result);
return result;
}

Expand All @@ -2187,8 +2198,11 @@ set_sub(PyObject *self, PyObject *other)

PyObject *rv;
Py_BEGIN_CRITICAL_SECTION2(so, other);
rv = set_difference(so, other);
rv = set_difference_untracked(so, other);
Py_END_CRITICAL_SECTION2();
if (rv != NULL) {
_PyObject_GC_TRACK(rv);
}
return rv;
}

Expand Down
Loading
Back | FazBrowse Home | New Git URL