fix tests and generation

Fidget-Spinner · Fidget-Spinner · commit b8519e088336 · 2026-04-12T18:21:51.000+08:00
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
@@ -237,7 +237,7 @@ add_op(JitOptContext *ctx, _PyUOpInstruction *this_instr,
     ctx->out_buffer.next++;
 }
 
-#define PROMOTE_TO_CONSTANT_POOL _Py_uop_promote_to_constant_pool
+#define sym_promote_to_constant_pool _Py_uop_promote_to_constant_pool
 
 /* Shortened forms for convenience, used in optimizer_bytecodes.c */
 #define sym_is_not_null _Py_uop_sym_is_not_null
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
diff --git a/Tools/cases_generator/optimizer_generator.py b/Tools/cases_generator/optimizer_generator.py
@@ -279,7 +279,7 @@ def replace_opcode_if_evaluates_pure(
 
                 emitter.emit(f"if (sym_is_const(ctx, {output_identifier.text})) {{\n")
                 emitter.emit(f"PyObject *result = sym_get_const(ctx, {output_identifier.text});\n")
-                emitter.emit(f"if (_Py_IsImmortal(result)) {{\n")
+                emitter.emit(f"if (_Py_uop_promote_to_constant_pool(ctx, result) == 0) {{\n")
                 emitter.emit(f"// Replace with {ops_desc} since we have {input_desc} and an immortal result\n")
                 for op, args in ops:
                     emitter.emit(f"ADD_OP({op}, {args});\n")

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ add_op(JitOptContext ctx, _PyUOpInstruction this_instr,`
`237`	`237`	`ctx->out_buffer.next++;`
`238`	`238`	`}`
`239`	`239`
`240`		`-#define PROMOTE_TO_CONSTANT_POOL _Py_uop_promote_to_constant_pool`
	`240`	`+#define sym_promote_to_constant_pool _Py_uop_promote_to_constant_pool`
`241`	`241`
`242`	`242`	`/* Shortened forms for convenience, used in optimizer_bytecodes.c */`
`243`	`243`	`#define sym_is_not_null _Py_uop_sym_is_not_null`