From: Brandt Bucher <brandt@python.org>
Date: Wed, 13 Oct 2021 22:34:11 +0000 (-0700)
Subject: Ensure that instruction cases are self-contained (GH-28938)
X-Git-Tag: v3.11.0a2~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e71662c1ae817e728233ce93882c5b20f4c31ebc;p=thirdparty%2FPython%2Fcpython.git

Ensure that instruction cases are self-contained (GH-28938)
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 0af233c0ba48..aef83b9c355f 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1710,8 +1710,8 @@ check_eval_breaker:
             DISPATCH();
         }
 
-        /* We keep LOAD_CLOSURE so that the bytecode stays more readable. */
         TARGET(LOAD_CLOSURE) {
+            /* We keep LOAD_CLOSURE so that the bytecode stays more readable. */
             PyObject *value = GETLOCAL(oparg);
             if (value == NULL) {
                 goto unbound_local_error;
@@ -3858,10 +3858,10 @@ check_eval_breaker:
             DISPATCH();
         }
 
-#define CANNOT_CATCH_MSG "catching classes that do not inherit from "\
-                         "BaseException is not allowed"
-
         TARGET(JUMP_IF_NOT_EXC_MATCH) {
+            const char *cannot_catch_msg = "catching classes that do not "
+                                           "inherit from BaseException is not "
+                                           "allowed";
             PyObject *right = POP();
             PyObject *left = POP();
             if (PyTuple_Check(right)) {
@@ -3871,7 +3871,7 @@ check_eval_breaker:
                     PyObject *exc = PyTuple_GET_ITEM(right, i);
                     if (!PyExceptionClass_Check(exc)) {
                         _PyErr_SetString(tstate, PyExc_TypeError,
-                                        CANNOT_CATCH_MSG);
+                                         cannot_catch_msg);
                         Py_DECREF(left);
                         Py_DECREF(right);
                         goto error;
@@ -3881,7 +3881,7 @@ check_eval_breaker:
             else {
                 if (!PyExceptionClass_Check(right)) {
                     _PyErr_SetString(tstate, PyExc_TypeError,
-                                    CANNOT_CATCH_MSG);
+                                     cannot_catch_msg);
                     Py_DECREF(left);
                     Py_DECREF(right);
                     goto error;