Rename one more DSL macro

Author: markshannon

Python/bytecodes.c

@@ -5389,11 +5389,11 @@ dummy_func(
          * ENTER_EXECUTOR will not re-enter tier 2 with the eval breaker set. */
         tier2 op(_TIER2_RESUME_CHECK, (--)) {
 #if defined(__EMSCRIPTEN__)
-            PERIODIC_IF(_Py_emscripten_signal_clock == 0);
+            HANDLE_PENDING_AND_DEOPT_IF(_Py_emscripten_signal_clock == 0);
             _Py_emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
 #endif
             uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker);
-            PERIODIC_IF(eval_breaker & _PY_EVAL_EVENTS_MASK);
+            HANDLE_PENDING_AND_DEOPT_IF(eval_breaker & _PY_EVAL_EVENTS_MASK);
             assert(tstate->tracing || eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));
         }
 

Tools/cases_generator/analyzer.py

@@ -709,7 +709,7 @@ def visit(stmt: Stmt) -> None:
             in_if = 0
             tkn_iter = iter(stmt.contents)
             for tkn in tkn_iter:
-                if tkn.kind == "IDENTIFIER" and tkn.text in ("DEOPT_IF", "ERROR_IF", "EXIT_IF", "PERIODIC_IF", "AT_END_EXIT_IF"):
+                if tkn.kind == "IDENTIFIER" and tkn.text in ("DEOPT_IF", "ERROR_IF", "EXIT_IF", "HANDLE_PENDING_AND_DEOPT_IF", "AT_END_EXIT_IF"):
                     in_if = 1
                     next(tkn_iter)
                 elif tkn.kind == "LPAREN":
@@ -893,12 +893,12 @@ def compute_properties(op: parser.CodeDef) -> Properties:
     )
     deopts_if = variable_used(op, "DEOPT_IF")
     exits_if = variable_used(op, "EXIT_IF") or variable_used(op, "AT_END_EXIT_IF")
-    deopts_periodic = variable_used(op, "PERIODIC_IF")
+    deopts_periodic = variable_used(op, "HANDLE_PENDING_AND_DEOPT_IF")
     exits_and_deopts = sum((deopts_if, exits_if, deopts_periodic))
     if exits_and_deopts > 1:
         tkn = op.tokens[0]
         raise lexer.make_syntax_error(
-            "Op cannot contain more than one of EXIT_IF, DEOPT_IF and PERIODIC_IF",
+            "Op cannot contain more than one of EXIT_IF, DEOPT_IF and HANDLE_PENDING_AND_DEOPT_IF",
             tkn.filename,
             tkn.line,
             tkn.column,

Tools/cases_generator/generators_common.py

@@ -113,7 +113,7 @@ def __init__(self, out: CWriter, labels: dict[str, Label], cannot_escape: bool =
             "EXIT_IF": self.exit_if,
             "AT_END_EXIT_IF": self.exit_if_after,
             "DEOPT_IF": self.deopt_if,
-            "PERIODIC_IF": self.periodic_if,
+            "HANDLE_PENDING_AND_DEOPT_IF": self.periodic_if,
             "ERROR_IF": self.error_if,
             "ERROR_NO_POP": self.error_no_pop,
             "DECREF_INPUTS": self.decref_inputs,
@@ -181,7 +181,7 @@ def periodic_if(
         storage: Storage,
         inst: Instruction | None,
     ) -> bool:
-        raise NotImplementedError("PERIODIC_IF not support in tier 1")
+        raise NotImplementedError("HANDLE_PENDING_AND_DEOPT_IF not support in tier 1")
 
     def exit_if_after(
         self,