Address review

Author: Fidget-Spinner

Python/bytecodes.c

@@ -5462,33 +5462,33 @@ dummy_func(
         }
 
         tier2 op(_GUARD_IP__PUSH_FRAME, (ip/4 --)) {
-            _Py_CODEUNIT *target = frame->instr_ptr + OFFSET_OF(_PUSH_FRAME);
+            _Py_CODEUNIT *target = frame->instr_ptr + IP_OFFSET_OF(_PUSH_FRAME);
             if (target != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += OFFSET_OF(_PUSH_FRAME);
+                frame->instr_ptr += IP_OFFSET_OF(_PUSH_FRAME);
                 EXIT_IF(true);
             }
         }
 
         tier2 op(_GUARD_IP_YIELD_VALUE, (ip/4 --)) {
-            _Py_CODEUNIT *target = frame->instr_ptr + OFFSET_OF(YIELD_VALUE);
+            _Py_CODEUNIT *target = frame->instr_ptr + IP_OFFSET_OF(YIELD_VALUE);
             if (target != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += OFFSET_OF(YIELD_VALUE);
+                frame->instr_ptr += IP_OFFSET_OF(YIELD_VALUE);
                 EXIT_IF(true);
             }
         }
 
         tier2 op(_GUARD_IP_RETURN_VALUE, (ip/4 --)) {
-            _Py_CODEUNIT *target = frame->instr_ptr + OFFSET_OF(RETURN_VALUE);
+            _Py_CODEUNIT *target = frame->instr_ptr + IP_OFFSET_OF(RETURN_VALUE);
             if (target != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += OFFSET_OF(RETURN_VALUE);
+                frame->instr_ptr += IP_OFFSET_OF(RETURN_VALUE);
                 EXIT_IF(true);
             }
         }
 
         tier2 op(_GUARD_IP_RETURN_GENERATOR, (ip/4 --)) {
-            _Py_CODEUNIT *target = frame->instr_ptr +  OFFSET_OF(RETURN_GENERATOR);
+            _Py_CODEUNIT *target = frame->instr_ptr +  IP_OFFSET_OF(RETURN_GENERATOR);
             if (target != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += OFFSET_OF(RETURN_GENERATOR);
+                frame->instr_ptr += IP_OFFSET_OF(RETURN_GENERATOR);
                 EXIT_IF(true);
             }
         }
@@ -5647,7 +5647,7 @@ dummy_func(
             int full = !_PyJit_translate_single_bytecode_to_trace(tstate, frame, next_instr, stop_tracing);
             if (full) {
                 LEAVE_TRACING();
-                int err = bail_tracing_and_jit(tstate, frame);
+                int err = stop_tracing_and_jit(tstate, frame);
                 ERROR_IF(err < 0);
                 DISPATCH_GOTO_NON_TRACING();
             }
@@ -5686,7 +5686,7 @@ dummy_func(
             int opcode = next_instr->op.code;
             _PyJit_translate_single_bytecode_to_trace(tstate, frame, NULL, true);
             LEAVE_TRACING();
-            int err = bail_tracing_and_jit(tstate, frame);
+            int err = stop_tracing_and_jit(tstate, frame);
             ERROR_IF(err < 0);
             DISPATCH_GOTO_NON_TRACING();
 #else

Python/ceval.c

@@ -993,7 +993,7 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch)
 #if _Py_TIER2
 // 0 for success, -1  for error.
 static int
-bail_tracing_and_jit(PyThreadState *tstate, _PyInterpreterFrame *frame)
+stop_tracing_and_jit(PyThreadState *tstate, _PyInterpreterFrame *frame)
 {
     int _is_sys_tracing = (tstate->c_tracefunc != NULL) || (tstate->c_profilefunc != NULL);
     int err = 0;
@@ -1245,7 +1245,7 @@ _PyTier2Interpreter(
         uopcode = next_uop->opcode;
 #ifdef Py_DEBUG
         if (frame->lltrace >= 3) {
-            // dump_stack(frame, stack_pointer);
+            dump_stack(frame, stack_pointer);
             if (next_uop->opcode == _START_EXECUTOR) {
                 printf("%4d uop: ", 0);
             }

Python/generated_cases.c.h

@@ -63,7 +63,7 @@ class Tier2Emitter(Emitter):
     def __init__(self, out: CWriter, labels: dict[str, Label]):
         super().__init__(out, labels)
         self._replacers["oparg"] = self.oparg
-        self._replacers["OFFSET_OF"] = self.offset_of
+        self._replacers["IP_OFFSET_OF"] = self.ip_offset_of
 
     def goto_error(self, offset: int, storage: Storage) -> str:
         # To do: Add jump targets for popping values.
@@ -135,7 +135,7 @@ def oparg(
         self.out.emit_at(uop.name[-1], tkn)
         return True
 
-    def offset_of(
+    def ip_offset_of(
         self,
         tkn: Token,
         tkn_iter: TokenIterator,