From 8614f86b7163b1c39798b481902dbb511292a537 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 27 Mar 2025 09:57:06 -0400 Subject: gh-131525: Cache the result of tuple_hash (#131529) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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> --- Objects/enumobject.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Objects/enumobject.c') diff --git a/Objects/enumobject.c b/Objects/enumobject.c index f5d9d41262a..1123b140c7f 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -6,6 +6,7 @@ #include "pycore_modsupport.h" // _PyArg_NoKwnames() #include "pycore_object.h" // _PyObject_GC_TRACK() #include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString +#include "pycore_tuple.h" // _PyTuple_Recycle() #include "clinic/enumobject.c.h" @@ -220,9 +221,7 @@ enum_next_long(enumobject *en, PyObject* next_item) Py_DECREF(old_item); // 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); return result; } result = PyTuple_New(2); @@ -272,9 +271,7 @@ enum_next(PyObject *op) Py_DECREF(old_item); // 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); return result; } result = PyTuple_New(2); -- cgit v1.2.3