Address review

Fidget-Spinner · Jan 21, 2025 · 36408f2 · 36408f2
1 parent c2c68de
commit 36408f2
Show file tree

Hide file tree

Showing 5 changed files with 1,190 additions and 1,239 deletions.
diff --git a/Lib/test/test_generated_cases.py b/Lib/test/test_generated_cases.py
@@ -412,12 +412,10 @@ def test_predictions(self):
             frame->instr_ptr = next_instr;
             next_instr += 1;
             INSTRUCTION_STATS(OP1);
-            PRED_OP1:
-            {
-                _PyStackRef res;
-                res = Py_None;
-                stack_pointer[-1] = res;
-            }
+            PREDICTED_OP1:;
+            _PyStackRef res;
+            res = Py_None;
+            stack_pointer[-1] = res;
             DISPATCH();
         }
 
@@ -648,38 +646,36 @@ def test_macro_instruction(self):
             frame->instr_ptr = next_instr;
             next_instr += 6;
             INSTRUCTION_STATS(OP);
-            PRED_OP:
+            PREDICTED_OP:;
+            _Py_CODEUNIT* const this_instr = next_instr - 6;
+            (void)this_instr;
+            _PyStackRef left;
+            _PyStackRef right;
+            _PyStackRef arg2;
+            _PyStackRef res;
+            // _OP1
             {
-                _Py_CODEUNIT* const this_instr = next_instr - 6;
-                (void)this_instr;
-                _PyStackRef left;
-                _PyStackRef right;
-                _PyStackRef arg2;
-                _PyStackRef res;
-                // _OP1
-                {
-                    right = stack_pointer[-1];
-                    left = stack_pointer[-2];
-                    uint16_t counter = read_u16(&this_instr[1].cache);
-                    (void)counter;
-                    _PyFrame_SetStackPointer(frame, stack_pointer);
-                    op1(left, right);
-                    stack_pointer = _PyFrame_GetStackPointer(frame);
-                }
-                /* Skip 2 cache entries */
-                // OP2
-                {
-                    arg2 = stack_pointer[-3];
-                    uint32_t extra = read_u32(&this_instr[4].cache);
-                    (void)extra;
-                    _PyFrame_SetStackPointer(frame, stack_pointer);
-                    res = op2(arg2, left, right);
-                    stack_pointer = _PyFrame_GetStackPointer(frame);
-                }
-                stack_pointer[-3] = res;
-                stack_pointer += -2;
-                assert(WITHIN_STACK_BOUNDS());
+                right = stack_pointer[-1];
+                left = stack_pointer[-2];
+                uint16_t counter = read_u16(&this_instr[1].cache);
+                (void)counter;
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                op1(left, right);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
             }
+            /* Skip 2 cache entries */
+            // OP2
+            {
+                arg2 = stack_pointer[-3];
+                uint32_t extra = read_u32(&this_instr[4].cache);
+                (void)extra;
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                res = op2(arg2, left, right);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
+            }
+            stack_pointer[-3] = res;
+            stack_pointer += -2;
+            assert(WITHIN_STACK_BOUNDS());
             DISPATCH();
         }
 

diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
@@ -249,7 +249,7 @@ GETITEM(PyObject *v, Py_ssize_t i) {
         /* This is only a single jump on release builds! */ \
         UPDATE_MISS_STATS((INSTNAME));                      \
         assert(_PyOpcode_Deopt[opcode] == (INSTNAME));      \
-        goto PRED_##INSTNAME;                               \
+        goto PREDICTED_##INSTNAME;                               \
     }