Address review (add long functions to allowlist)

Author: Fidget-Spinner

Include/internal/pycore_opcode_metadata.h

@@ -2225,9 +2225,11 @@ def test_validate_uop_unused_size_mismatch(self):
             self.run_cases_test(input, input2, output)
 
     def test_pure_uop_body_copied_in(self):
+        # Note: any non-escaping call works.
+        # In this case, we use _PyLong_Add.
         input = """
         pure op(OP, (foo -- res)) {
-            res = body(foo);
+            res = _PyLong_Add(foo);
         }
         """
         input2 = """
@@ -2248,15 +2250,14 @@ def test_pure_uop_body_copied_in(self):
                 _PyStackRef foo = sym_get_const_as_stackref(ctx, foo_sym);
                 _PyStackRef res_stackref;
                 /* Start of uop copied from bytecodes for constant evaluation */
-                res_stackref = body(foo);
+                res_stackref = _PyLong_Add(foo);
                 /* End of uop copied from bytecodes for constant evaluation */
                 res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
                 stack_pointer[-1] = res;
+                break;
             }
-            else {
-                res = sym_new_known(ctx, foo);
-                stack_pointer[-1] = res;
-            }
+            res = sym_new_known(ctx, foo);
+            stack_pointer[-1] = res;
             break;
         }
         """
@@ -2266,7 +2267,7 @@ def test_pure_uop_body_copied_in_complex(self):
         input = """
         pure op(OP, (foo -- res)) {
             if (foo) {
-                res = body(foo);
+                res = _PyLong_Add(foo);
             }
             else {
                 res = 1;
@@ -2292,19 +2293,18 @@ def test_pure_uop_body_copied_in_complex(self):
                 _PyStackRef res_stackref;
                 /* Start of uop copied from bytecodes for constant evaluation */
                 if (foo) {
-                    res_stackref = body(foo);
+                    res_stackref = _PyLong_Add(foo);
                 }
                 else {
                     res_stackref = 1;
                 }
                 /* End of uop copied from bytecodes for constant evaluation */
                 res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
                 stack_pointer[-1] = res;
+                break;
             }
-            else {
-                res = sym_new_known(ctx, foo);
-                stack_pointer[-1] = res;
-            }
+            res = sym_new_known(ctx, foo);
+            stack_pointer[-1] = res;
             break;
         }
         """

Include/internal/pycore_uop_metadata.h

@@ -635,6 +635,9 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
     "_PyLong_IsNegative",
     "_PyLong_IsNonNegativeCompact",
     "_PyLong_IsZero",
+    "_PyLong_Add",
+    "_PyLong_Multiply",
+    "_PyLong_Subtract",
     "_PyManagedDictPointer_IsValues",
     "_PyObject_GC_IS_SHARED",
     "_PyObject_GC_IS_TRACKED",

Lib/test/test_generated_cases.py

@@ -138,7 +138,6 @@ def __init__(self, out: CWriter, labels: dict[str, Label]):
         }
         self.out = out
         self.labels = labels
-        self.is_abstract = False
 
     def emit_to_with_replacement(
         self,
@@ -512,7 +511,7 @@ def emit_SimpleStmt(
         reachable = True
         tkn = stmt.contents[-1]
         try:
-            if stmt in uop.properties.escaping_calls and not self.is_abstract:
+            if stmt in uop.properties.escaping_calls:
                 escape = uop.properties.escaping_calls[stmt]
                 if escape.kills is not None:
                     self.stackref_kill(escape.kills, storage, True)
@@ -549,7 +548,7 @@ def emit_SimpleStmt(
                         self.out.emit(tkn)
                 else:
                     self.out.emit(tkn)
-            if stmt in uop.properties.escaping_calls and not self.is_abstract:
+            if stmt in uop.properties.escaping_calls:
                 self.emit_reload(storage)
             return reachable, None, storage
         except StackError as ex:

Python/executor_cases.c.h

@@ -146,7 +146,6 @@ class OptimizerEmitter(Emitter):
     def __init__(self, out: CWriter, labels: dict[str, Label], original_uop: Uop, stack: Stack):
         super().__init__(out, labels)
         self._replacers["REPLACE_OPCODE_IF_EVALUATES_PURE"] = self.replace_opcode_if_evaluates_pure
-        self.is_abstract = True
         self.original_uop = original_uop
         self.stack = stack
 
@@ -169,6 +168,12 @@ def replace_opcode_if_evaluates_pure(
         inst: Instruction | None,
     ) -> bool:
         skip_to(tkn_iter, "SEMI")
+
+        if self.original_uop.properties.escapes:
+            raise analysis_error(
+                f"REPLACE_OPCODE_IF_EVALUATES_PURE cannot be used with an escaping uop {self.original_uop.properties.escaping_calls}",
+                self.original_uop.body.open
+            )
         emitter = OptimizerConstantEmitter(self.out, {}, self.original_uop, copy.deepcopy(self.stack))
         emitter.emit("if (\n")
         input_identifiers = replace_opcode_if_evaluates_pure_identifiers(uop)
@@ -256,11 +261,12 @@ def write_uop(
     override: Uop | None,
     uop: Uop,
     out: CWriter,
+    stack: Stack,
     debug: bool,
+    skip_inputs: bool,
 ) -> None:
     locals: dict[str, Local] = {}
     prototype = override if override else uop
-    stack = Stack()
     try:
         out.start_line()
         if override:
@@ -285,8 +291,8 @@ def write_uop(
             # No reference management of inputs needed.
             for var in storage.inputs:  # type: ignore[possibly-undefined]
                 var.in_local = False
+            _, storage = emitter.emit_tokens(override, storage, None, False)
             out.start_line()
-            _, storage = emitter.emit_tokens(override, storage, inst=None, emit_braces=False)
             storage.flush(out)
             out.start_line()
         else:
@@ -335,7 +341,8 @@ def generate_abstract_interpreter(
             declare_variables(override, out, skip_inputs=False)
         else:
             declare_variables(uop, out, skip_inputs=True)
-        write_uop(override, uop, out, debug)
+        stack = Stack()
+        write_uop(override, uop, out, stack, debug, skip_inputs=(override is None))
         out.start_line()
         out.emit("break;\n")
         out.emit("}")