Fix test

Lib/test/test_generated_cases.py

@@ -540,7 +540,7 @@ def test_error_if_plain(self):
             frame->instr_ptr = next_instr;
             next_instr += 1;
             INSTRUCTION_STATS(OP);
-            if (cond) CEVAL_GOTO(label);
+            if (cond) goto label;
             DISPATCH();
         }
     """
@@ -557,7 +557,7 @@ def test_error_if_plain_with_comment(self):
             frame->instr_ptr = next_instr;
             next_instr += 1;
             INSTRUCTION_STATS(OP);
-            if (cond) CEVAL_GOTO(label);
+            if (cond) goto label;
             // Comment is ok
             DISPATCH();
         }
@@ -584,7 +584,7 @@ def test_error_if_pop(self):
             right = stack_pointer[-1];
             left = stack_pointer[-2];
             SPAM(left, right);
-            if (cond) CEVAL_GOTO(pop_2_label);
+            if (cond) goto pop_2_label;
             res = 0;
             stack_pointer[-2] = res;
             stack_pointer += -1;
@@ -613,7 +613,7 @@ def test_error_if_pop_with_result(self):
             right = stack_pointer[-1];
             left = stack_pointer[-2];
             res = SPAM(left, right);
-            if (cond) CEVAL_GOTO(pop_2_label);
+            if (cond) goto pop_2_label;
             stack_pointer[-2] = res;
             stack_pointer += -1;
             assert(WITHIN_STACK_BOUNDS());
@@ -931,7 +931,7 @@ def test_array_error_if(self):
             if (oparg == 0) {
                 stack_pointer += -1 - oparg;
                 assert(WITHIN_STACK_BOUNDS());
-                CEVAL_GOTO(somewhere);
+                goto somewhere;
             }
             stack_pointer += -1 - oparg;
             assert(WITHIN_STACK_BOUNDS());
@@ -1394,7 +1394,7 @@ def test_pop_on_error_peeks(self):
             // THIRD
             {
                 // Mark j and k as used
-                if (cond) CEVAL_GOTO(pop_2_error);
+                if (cond) goto pop_2_error;
             }
             stack_pointer += -2;
             assert(WITHIN_STACK_BOUNDS());
@@ -1437,7 +1437,7 @@ def test_push_then_error(self):
                     stack_pointer[1] = b;
                     stack_pointer += 2;
                     assert(WITHIN_STACK_BOUNDS());
-                    CEVAL_GOTO(error);
+                    goto error;
                 }
             }
             stack_pointer[0] = a;
@@ -1464,14 +1464,14 @@ def test_error_if_true(self):
             frame->instr_ptr = next_instr;
             next_instr += 1;
             INSTRUCTION_STATS(OP1);
-            CEVAL_GOTO(here);
+            goto here;
         }
 
         TARGET(OP2) {
             frame->instr_ptr = next_instr;
             next_instr += 1;
             INSTRUCTION_STATS(OP2);
-            CEVAL_GOTO(there);
+            goto there;
         }
         """
         self.run_cases_test(input, output)
@@ -1854,7 +1854,7 @@ def test_fallthrough_label(self):
         Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_error(TAIL_CALL_PARAMS)
         {
             DO_THING();
-            CEVAL_GOTO(fallthrough);
+            TAIL_CALL(fallthrough);
         }
 
         Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_fallthrough(TAIL_CALL_PARAMS)
@@ -1888,10 +1888,10 @@ def test_transform_gotos(self):
         Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_error(TAIL_CALL_PARAMS)
         {
             if (thing) {
-            CEVAL_GOTO(fallthrough);
+            TAIL_CALL(fallthrough);
             }
             DO_THING();
-            CEVAL_GOTO(fallthrough);
+            TAIL_CALL(fallthrough);
         }
 
         Py_PRESERVE_NONE_CC static PyObject *_TAIL_CALL_fallthrough(TAIL_CALL_PARAMS)

Python/ceval.c

@@ -785,7 +785,8 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch)
 
 #ifdef Py_TAIL_CALL_INTERP
 #include "generated_tail_call_handlers.c.h"
-static inline PyObject *_TAIL_CALL_shim(TAIL_CALL_PARAMS)
+static inline PyObject *
+_TAIL_CALL_shim(TAIL_CALL_PARAMS)
 {
     opcode = next_instr->op.code;
     oparg = next_instr->op.arg;