diff options
| author | Michael Droettboom <mdboom@gmail.com> | 2025-03-27 09:57:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-27 09:57:06 -0400 |
| commit | 8614f86b7163b1c39798b481902dbb511292a537 (patch) | |
| tree | 2bf6a46b432df3d6bf01a4176f3a614a01c48566 /Modules/itertoolsmodule.c | |
| parent | cf5e438c0297954c4411c1c3ae4ba67a48b134ea (diff) | |
| download | cpython-8614f86b7163b1c39798b481902dbb511292a537.tar.gz cpython-8614f86b7163b1c39798b481902dbb511292a537.zip | |
gh-131525: Cache the result of tuple_hash (#131529)
* gh-131525: Cache the result of tuple_hash
* Fix debug builds
* Add blurb
* Fix formatting
* Pre-compute empty tuple singleton
* Mostly set the cache within tuple_alloc
* Fixes for TSAN
* Pre-compute empty tuple singleton
* Fix for 32-bit platforms
* Assert that op != NULL in _PyTuple_RESET_HASH_CACHE
* Use FT_ATOMIC_STORE_SSIZE_RELAXED macro
* Update Include/internal/pycore_tuple.h
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
* Fix alignment
* atomic load
* Update Objects/tupleobject.c
Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
---------
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
Diffstat (limited to 'Modules/itertoolsmodule.c')
| -rw-r--r-- | Modules/itertoolsmodule.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 9c9a965ce74..c0448efed19 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -386,9 +386,7 @@ pairwise_next(PyObject *op) Py_DECREF(last_new); // bpo-42536: The GC may have untracked this result tuple. Since we're // recycling it, make sure it's tracked again: - if (!_PyObject_GC_IS_TRACKED(result)) { - _PyObject_GC_TRACK(result); - } + _PyTuple_Recycle(result); } else { result = PyTuple_New(2); @@ -2126,8 +2124,8 @@ product_next(PyObject *op) } // bpo-42536: The GC may have untracked this result tuple. Since we're // recycling it, make sure it's tracked again: - else if (!_PyObject_GC_IS_TRACKED(result)) { - _PyObject_GC_TRACK(result); + else { + _PyTuple_Recycle(result); } /* Now, we've got the only copy so we can update it in-place */ assert (npools==0 || Py_REFCNT(result) == 1); @@ -2355,8 +2353,8 @@ combinations_next(PyObject *op) } // bpo-42536: The GC may have untracked this result tuple. Since we're // recycling it, make sure it's tracked again: - else if (!_PyObject_GC_IS_TRACKED(result)) { - _PyObject_GC_TRACK(result); + else { + _PyTuple_Recycle(result); } /* Now, we've got the only copy so we can update it in-place * CPython's empty tuple is a singleton and cached in @@ -2601,8 +2599,8 @@ cwr_next(PyObject *op) } // bpo-42536: The GC may have untracked this result tuple. Since we're // recycling it, make sure it's tracked again: - else if (!_PyObject_GC_IS_TRACKED(result)) { - _PyObject_GC_TRACK(result); + else { + _PyTuple_Recycle(result); } /* Now, we've got the only copy so we can update it in-place CPython's empty tuple is a singleton and cached in PyTuple's freelist. */ @@ -2862,8 +2860,8 @@ permutations_next(PyObject *op) } // bpo-42536: The GC may have untracked this result tuple. Since we're // recycling it, make sure it's tracked again: - else if (!_PyObject_GC_IS_TRACKED(result)) { - _PyObject_GC_TRACK(result); + else { + _PyTuple_Recycle(result); } /* Now, we've got the only copy so we can update it in-place */ assert(r == 0 || Py_REFCNT(result) == 1); @@ -3843,9 +3841,7 @@ zip_longest_next(PyObject *op) } // bpo-42536: The GC may have untracked this result tuple. Since we're // recycling it, make sure it's tracked again: - if (!_PyObject_GC_IS_TRACKED(result)) { - _PyObject_GC_TRACK(result); - } + _PyTuple_Recycle(result); } else { result = PyTuple_New(tuplesize); if (result == NULL) |