diff options
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) |