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

[3.15] gh-152235: Defer GC tracking in more set operations (gh-152273) by miss-islington · Pull Request #152278 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

[3.15] gh-152235: Defer GC tracking in more set operations (gh-152273) #152278

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
+36 −10
Conversation 1 Commits 1 Checks 58 Files changed 2
Merged

[3.15] gh-152235: Defer GC tracking in more set operations (gh-152273) #152278

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
2 changes: 2 additions & 0 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
@@ -0,0 +1,2 @@
Defer GC tracking of :meth:`set.intersection`, :meth:`set.difference` and
:meth:`set.symmetric_difference`. Patch by Donghee Na.
44 changes: 34 additions & 10 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 @@ -1345,14 +1345,14 @@ set_update_impl(PySetObject *so, PyObject * const *others,
can be retrieved or updated in a single cache line.
*/

// Build a set/frozenset left GC-untracked; the caller must _PyObject_GC_TRACK()
// it once fully built, so a half-built set is never exposed during filling.
static PyObject *
make_new_set(PyTypeObject *type, PyObject *iterable)
make_new_set_untracked(PyTypeObject *type, PyObject *iterable)
{
assert(PyType_Check(type));
PySetObject *so;

// Allocate untracked: the fill below runs user code, and a half-built
// set must not be reachable from another thread via gc.get_objects().
so = (PySetObject *)_PyType_AllocNoTrack(type, 0);
if (so == NULL)
return NULL;
Expand All @@ -1372,21 +1372,39 @@ make_new_set(PyTypeObject *type, PyObject *iterable)
}
}

// Track only once fully built.
_PyObject_GC_TRACK(so);
return (PyObject *)so;
}

static PyObject *
make_new_set_basetype(PyTypeObject *type, PyObject *iterable)
make_new_set(PyTypeObject *type, PyObject *iterable)
{
PyObject *so = make_new_set_untracked(type, iterable);
if (so != NULL) {
_PyObject_GC_TRACK(so);
}
return so;
}

static PyObject *
make_new_set_basetype_untracked(PyTypeObject *type, PyObject *iterable)
{
if (type != &PySet_Type && type != &PyFrozenSet_Type) {
if (PyType_IsSubtype(type, &PySet_Type))
type = &PySet_Type;
else
type = &PyFrozenSet_Type;
}
return make_new_set(type, iterable);
return make_new_set_untracked(type, iterable);
}

static PyObject *
make_new_set_basetype(PyTypeObject *type, PyObject *iterable)
{
PyObject *so = make_new_set_basetype_untracked(type, iterable);
if (so != NULL) {
_PyObject_GC_TRACK(so);
}
return so;
}

// gh-140232: check whether a frozenset can be untracked from the GC
Expand Down Expand Up @@ -1686,7 +1704,7 @@ set_intersection(PySetObject *so, PyObject *other)
if ((PyObject *)so == other)
return set_copy_impl(so);

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

Expand Down Expand Up @@ -1719,6 +1737,7 @@ set_intersection(PySetObject *so, PyObject *other)
}
Py_DECREF(key);
}
_PyObject_GC_TRACK(result);
return (PyObject *)result;
}

Expand Down Expand Up @@ -1750,6 +1769,7 @@ set_intersection(PySetObject *so, PyObject *other)
Py_DECREF(result);
return NULL;
}
_PyObject_GC_TRACK(result);
return (PyObject *)result;
error:
Py_DECREF(it);
Expand Down Expand Up @@ -2064,7 +2084,7 @@ set_difference(PySetObject *so, PyObject *other)
return set_copy_and_difference(so, other);
}

result = make_new_set_basetype(Py_TYPE(so), NULL);
result = make_new_set_basetype_untracked(Py_TYPE(so), NULL);
if (result == NULL)
return NULL;

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

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

Expand Down Expand Up @@ -2312,7 +2334,8 @@ static PyObject *
set_symmetric_difference_impl(PySetObject *so, PyObject *other)
/*[clinic end generated code: output=270ee0b5d42b0797 input=8c29b0be90d47feb]*/
{
PySetObject *result = (PySetObject *)make_new_set_basetype(Py_TYPE(so), NULL);
PySetObject *result =
(PySetObject *)make_new_set_basetype_untracked(Py_TYPE(so), NULL);
if (result == NULL) {
return NULL;
}
Expand All @@ -2324,6 +2347,7 @@ set_symmetric_difference_impl(PySetObject *so, PyObject *other)
Py_DECREF(result);
return NULL;
}
_PyObject_GC_TRACK(result);
return (PyObject *)result;
}

Expand Down
Loading
Back | FazBrowse Home | New Git URL