From d02409a686c44cebda4d92fa222cc7437822ce04 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Thu, 9 May 2024 18:30:34 +0300 Subject: [PATCH 1/2] gh-118849: Fix "code will never be executed" warning in `dictobject.c` --- Objects/dictobject.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index b0fce09d7940e0..3de5d78fe6218c 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -5491,10 +5491,9 @@ dictiter_iternext_threadsafe(PyDictObject *d, PyObject *self, Py_DECREF(d); return -1; - int res; try_locked: Py_BEGIN_CRITICAL_SECTION(d); - res = dictiter_iternextitem_lock_held(d, self, out_key, out_value); + int res = dictiter_iternextitem_lock_held(d, self, out_key, out_value); Py_END_CRITICAL_SECTION(); return res; } From 60560236dcfafa751057e2908cd576e195551351 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Thu, 9 May 2024 19:26:18 +0300 Subject: [PATCH 2/2] Fix CI --- Objects/dictobject.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 3de5d78fe6218c..985a326a176c94 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -5396,6 +5396,7 @@ static int dictiter_iternext_threadsafe(PyDictObject *d, PyObject *self, PyObject **out_key, PyObject **out_value) { + int res; dictiterobject *di = (dictiterobject *)self; Py_ssize_t i; PyDictKeysObject *k; @@ -5493,7 +5494,7 @@ dictiter_iternext_threadsafe(PyDictObject *d, PyObject *self, try_locked: Py_BEGIN_CRITICAL_SECTION(d); - int res = dictiter_iternextitem_lock_held(d, self, out_key, out_value); + res = dictiter_iternextitem_lock_held(d, self, out_key, out_value); Py_END_CRITICAL_SECTION(); return res; }