Simplify result handling

mdboom · Apr 4, 2024 · b917d1f · b917d1f
1 parent 27267d7
commit b917d1f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Tools/cases_generator/analyzer.py b/Tools/cases_generator/analyzer.py
@@ -29,6 +29,7 @@ class Properties:
     oparg_and_1: bool = False
     const_oparg: int = -1
     stub: bool = False
+    errors_if: bool = False
 
     def dump(self, indent: str) -> None:
         print(indent, end="")
@@ -540,6 +541,7 @@ def compute_properties(op: parser.InstDef) -> Properties:
     )
     deopts_if = variable_used(op, "DEOPT_IF")
     exits_if = variable_used(op, "EXIT_IF")
+    errors_if = variable_used(op, "ERROR_IF")
     if deopts_if and exits_if:
         tkn = op.tokens[0]
         raise lexer.make_syntax_error(
@@ -575,6 +577,7 @@ def compute_properties(op: parser.InstDef) -> Properties:
         passthrough=passthrough,
         tier=tier_variable(op),
         stub="stub" in op.annotations,
+        errors_if=errors_if
     )
 
 

diff --git a/Tools/cases_generator/tier2_generator.py b/Tools/cases_generator/tier2_generator.py
@@ -220,10 +220,12 @@ def generate_tier2(
             out.emit("switch (result) {\n")
             out.emit("case 0:\n")
             out.emit("break;\n")
-            out.emit("case 1:\n")
-            out.emit("JUMP_TO_ERROR();\n");
-            out.emit("case 2:\n")
-            out.emit("JUMP_TO_JUMP_TARGET();\n");
+            if uop.properties.errors_if:
+                out.emit("case 1:\n")
+                out.emit("JUMP_TO_ERROR();\n");
+            if uop.properties.deopts:
+                out.emit("case 2:\n")
+                out.emit("JUMP_TO_JUMP_TARGET();\n");
             out.emit("}\n")
             stack = None
         else: