Rename DSL macro for clarity

Author: markshannon

Python/bytecodes.c

@@ -5186,28 +5186,28 @@ dummy_func(
         op (_GUARD_IS_TRUE_POP, (flag -- )) {
             int is_true = PyStackRef_IsTrue(flag);
             DEAD(flag);
-            EXIT_IF_AFTER(!is_true);
+            AT_END_EXIT_IF(!is_true);
         }
 
         op (_GUARD_IS_FALSE_POP, (flag -- )) {
             int is_false = PyStackRef_IsFalse(flag);
             DEAD(flag);
-            EXIT_IF_AFTER(!is_false);
+            AT_END_EXIT_IF(!is_false);
         }
 
         op (_GUARD_IS_NONE_POP, (val -- )) {
             int is_none = PyStackRef_IsNone(val);
             if (!is_none) {
                 PyStackRef_CLOSE(val);
-                EXIT_IF_AFTER(1);
+                AT_END_EXIT_IF(1);
             }
             DEAD(val);
         }
 
         op (_GUARD_IS_NOT_NONE_POP, (val -- )) {
             int is_none = PyStackRef_IsNone(val);
             PyStackRef_CLOSE(val);
-            EXIT_IF_AFTER(is_none);
+            AT_END_EXIT_IF(is_none);
         }
 
         op(_JUMP_TO_TOP, (--)) {

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", "EXIT_IF_AFTER"):
+                if tkn.kind == "IDENTIFIER" and tkn.text in ("DEOPT_IF", "ERROR_IF", "EXIT_IF", "PERIODIC_IF", "AT_END_EXIT_IF"):
                     in_if = 1
                     next(tkn_iter)
                 elif tkn.kind == "LPAREN":
@@ -836,7 +836,7 @@ def stmt_is_simple_exit(stmt: Stmt) -> bool:
     if len(tokens) < 4:
         return False
     return (
-        tokens[0].text in ("ERROR_IF", "DEOPT_IF", "EXIT_IF", "EXIT_IF_AFTER")
+        tokens[0].text in ("ERROR_IF", "DEOPT_IF", "EXIT_IF", "AT_END_EXIT_IF")
         and
         tokens[1].text == "("
         and
@@ -892,7 +892,7 @@ def compute_properties(op: parser.CodeDef) -> Properties:
         or variable_used(op, "PyCell_SwapTakeRef")
     )
     deopts_if = variable_used(op, "DEOPT_IF")
-    exits_if = variable_used(op, "EXIT_IF") or variable_used(op, "EXIT_IF_AFTER")
+    exits_if = variable_used(op, "EXIT_IF") or variable_used(op, "AT_END_EXIT_IF")
     deopts_periodic = variable_used(op, "PERIODIC_IF")
     exits_and_deopts = sum((deopts_if, exits_if, deopts_periodic))
     if exits_and_deopts > 1:

Tools/cases_generator/generators_common.py

@@ -111,7 +111,7 @@ class Emitter:
     def __init__(self, out: CWriter, labels: dict[str, Label], cannot_escape: bool = False):
         self._replacers = {
             "EXIT_IF": self.exit_if,
-            "EXIT_IF_AFTER": self.exit_if_after,
+            "AT_END_EXIT_IF": self.exit_if_after,
             "DEOPT_IF": self.deopt_if,
             "PERIODIC_IF": self.periodic_if,
             "ERROR_IF": self.error_if,
@@ -191,7 +191,7 @@ def exit_if_after(
         storage: Storage,
         inst: Instruction | None,
     ) -> bool:
-        storage.clear_inputs("in EXIT_IF_AFTER")
+        storage.clear_inputs("in AT_END_EXIT_IF")
         storage.flush(self.out)
         storage.stack.clear(self.out)
         return self.exit_if(tkn, tkn_iter, uop, storage, inst)

Tools/cases_generator/tier1_generator.py

@@ -132,7 +132,7 @@ def uses_this(inst: Instruction) -> bool:
             continue
         for tkn in uop.body.tokens():
             if (tkn.kind == "IDENTIFIER"
-                    and (tkn.text in {"DEOPT_IF", "EXIT_IF", "EXIT_IF_AFTER"})):
+                    and (tkn.text in {"DEOPT_IF", "EXIT_IF", "AT_END_EXIT_IF"})):
                 return True
     return False