From: Brandt Bucher <brandtbucher@microsoft.com>
Date: Tue, 30 Aug 2022 22:45:24 +0000 (-0700)
Subject: Remove the binary_subscr_dict_error label (GH-96443)
X-Git-Tag: v3.12.0a1~510
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88671a9d6916229badc8b97a358a0f596f5aa0a1;p=thirdparty%2FPython%2Fcpython.git

Remove the binary_subscr_dict_error label (GH-96443)
---

diff --git a/Python/ceval.c b/Python/ceval.c
index b3a0a3640eb9..c61ccd7dfc6f 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1621,7 +1621,10 @@ handle_eval_breaker:
             PyObject *sub = TOP();
             PyObject *res = PyDict_GetItemWithError(dict, sub);
             if (res == NULL) {
-                goto binary_subscr_dict_error;
+                if (!_PyErr_Occurred(tstate)) {
+                    _PyErr_SetKeyError(sub);
+                }
+                goto error;
             }
             Py_INCREF(res);
             STACK_SHRINK(1);
@@ -5193,16 +5196,6 @@ miss:
         DISPATCH_GOTO();
     }
 
-binary_subscr_dict_error:
-        {
-            PyObject *sub = POP();
-            if (!_PyErr_Occurred(tstate)) {
-                _PyErr_SetKeyError(sub);
-            }
-            Py_DECREF(sub);
-            goto error;
-        }
-
 unbound_local_error:
         {
             format_exc_check_arg(tstate, PyExc_UnboundLocalError,