From: Brandt Bucher <brandtbucher@microsoft.com>
Date: Fri, 9 Sep 2022 21:43:10 +0000 (-0700)
Subject: Replace ad-hoc labels with JUMP_TO_INSTRUCTION (GH-96634)
X-Git-Tag: v3.12.0a1~436
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72b29b2611eb7d161958c92993c5050a037d06e4;p=thirdparty%2FPython%2Fcpython.git

Replace ad-hoc labels with JUMP_TO_INSTRUCTION (GH-96634)
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 8fca585eb71c..7d4543ea03d9 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4107,7 +4107,7 @@ handle_eval_breaker:
             PEEK(oparg + 1) = self;
             PEEK(oparg + 2) = meth;
             Py_DECREF(function);
-            goto call_exact_args;
+            JUMP_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
         }
 
         TARGET(KW_NAMES) {
@@ -4118,8 +4118,8 @@ handle_eval_breaker:
         }
 
         TARGET(CALL) {
+            PREDICTED(CALL);
             int total_args, is_meth;
-        call_function:
             is_meth = is_method(stack_pointer, oparg);
             PyObject *function = PEEK(oparg + 1);
             if (!is_meth && Py_TYPE(function) == &PyMethod_Type) {
@@ -4207,12 +4207,12 @@ handle_eval_breaker:
             else {
                 STAT_INC(CALL, deferred);
                 DECREMENT_ADAPTIVE_COUNTER(cache);
-                goto call_function;
+                JUMP_TO_INSTRUCTION(CALL);
             }
         }
 
         TARGET(CALL_PY_EXACT_ARGS) {
-        call_exact_args:
+            PREDICTED(CALL_PY_EXACT_ARGS);
             assert(call_shape.kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             _PyCallCache *cache = (_PyCallCache *)next_instr;