gh-148083: Prevent constant folding when lhs is container types (gh-148090)

corona10 · web-flow · commit 853dafe23a13 · 2026-04-05T00:40:12.000+09:00
diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
@@ -394,6 +394,7 @@ extern JitOptRef _Py_uop_sym_new_type(
 extern JitOptRef _Py_uop_sym_new_const(JitOptContext *ctx, PyObject *const_val);
 extern JitOptRef _Py_uop_sym_new_const_steal(JitOptContext *ctx, PyObject *const_val);
 bool _Py_uop_sym_is_safe_const(JitOptContext *ctx, JitOptRef sym);
+bool _Py_uop_sym_is_not_container(JitOptRef sym);
 _PyStackRef _Py_uop_sym_get_const_as_stackref(JitOptContext *ctx, JitOptRef sym);
 extern JitOptRef _Py_uop_sym_new_null(JitOptContext *ctx);
 extern bool _Py_uop_sym_has_type(JitOptRef sym);
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
@@ -252,6 +252,7 @@ add_op(JitOptContext *ctx, _PyUOpInstruction *this_instr,
 #define sym_is_not_null _Py_uop_sym_is_not_null
 #define sym_is_const _Py_uop_sym_is_const
 #define sym_is_safe_const _Py_uop_sym_is_safe_const
+#define sym_is_not_container _Py_uop_sym_is_not_container
 #define sym_get_const _Py_uop_sym_get_const
 #define sym_new_const_steal _Py_uop_sym_new_const_steal
 #define sym_get_const_as_stackref _Py_uop_sym_get_const_as_stackref
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
@@ -515,7 +515,8 @@ dummy_func(void) {
         res = sym_new_not_null(ctx);
         ds = dict_st;
         ss = sub_st;
-        if (sym_matches_type(dict_st, &PyFrozenDict_Type)) {
+        if (sym_is_not_container(sub_st) &&
+            sym_matches_type(dict_st, &PyFrozenDict_Type)) {
             REPLACE_OPCODE_IF_EVALUATES_PURE(dict_st, sub_st, res);
         }
     }
@@ -706,7 +707,8 @@ dummy_func(void) {
         b = sym_new_type(ctx, &PyBool_Type);
         l = left;
         r = right;
-        if (sym_matches_type(right, &PyFrozenSet_Type)) {
+        if (sym_is_not_container(left) &&
+            sym_matches_type(right, &PyFrozenSet_Type)) {
             REPLACE_OPCODE_IF_EVALUATES_PURE(left, right, b);
         }
     }
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
diff --git a/Python/optimizer_symbols.c b/Python/optimizer_symbols.c
@@ -287,6 +287,20 @@ _Py_uop_sym_is_safe_const(JitOptContext *ctx, JitOptRef sym)
            (typ == &PyFrozenSet_Type);
 }
 
+bool
+_Py_uop_sym_is_not_container(JitOptRef sym)
+{
+    PyTypeObject *typ = _Py_uop_sym_get_type(sym);
+    if (typ == NULL) {
+        return false;
+    }
+    return (typ == &PyLong_Type) ||
+           (typ == &PyFloat_Type) ||
+           (typ == &PyUnicode_Type) ||
+           (typ == &_PyNone_Type) ||
+           (typ == &PyBool_Type);
+}
+
 void
 _Py_uop_sym_set_type(JitOptContext *ctx, JitOptRef ref, PyTypeObject *typ)
 {

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,8 @@ dummy_func(void) {`
`515`	`515`	`res = sym_new_not_null(ctx);`
`516`	`516`	`ds = dict_st;`
`517`	`517`	`ss = sub_st;`
`518`		`- if (sym_matches_type(dict_st, &PyFrozenDict_Type)) {`
	`518`	`+ if (sym_is_not_container(sub_st) &&`
	`519`	`+ sym_matches_type(dict_st, &PyFrozenDict_Type)) {`
`519`	`520`	`REPLACE_OPCODE_IF_EVALUATES_PURE(dict_st, sub_st, res);`
`520`	`521`	`}`
`521`	`522`	`}`
`@@ -706,7 +707,8 @@ dummy_func(void) {`
`706`	`707`	`b = sym_new_type(ctx, &PyBool_Type);`
`707`	`708`	`l = left;`
`708`	`709`	`r = right;`
`709`		`- if (sym_matches_type(right, &PyFrozenSet_Type)) {`
	`710`	`+ if (sym_is_not_container(left) &&`
	`711`	`+ sym_matches_type(right, &PyFrozenSet_Type)) {`
`710`	`712`	`REPLACE_OPCODE_IF_EVALUATES_PURE(left, right, b);`
`711`	`713`	`}`
`712`	`714`	`}`