Catch up with main

python · brandtbucher · Apr 1, 2025 · Mar 27, 2025 · Mar 27, 2025 · Mar 27, 2025
commit c6bc3559e5a6cc71bff0747379ea9f61ec40d1f6
diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
@@ -512,6 +512,12 @@ dummy_func(
             res = PyStackRef_False;
         }
 
+        op(_GUARD_NOS_UNICODE, (nos, tos -- nos, tos)) {
+            (void)tos;
+            PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
+            EXIT_IF(!PyUnicode_CheckExact(o));
+        }
+
         op(_GUARD_TOS_UNICODE, (value -- value)) {
             PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
             EXIT_IF(!PyUnicode_CheckExact(value_o));
@@ -695,17 +701,6 @@ dummy_func(
         macro(BINARY_OP_SUBTRACT_FLOAT) =
             _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/5 + _BINARY_OP_SUBTRACT_FLOAT;
 
-        op(_GUARD_NOS_UNICODE, (nos, tos -- nos, tos)) {
-            (void)tos;
-            PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
-            EXIT_IF(!PyUnicode_CheckExact(o));
-        }
-
-        op(_GUARD_TOS_UNICODE, (tos -- tos)) {
-            PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
-            EXIT_IF(!PyUnicode_CheckExact(o));
-        }
-
         pure op(_BINARY_OP_ADD_UNICODE, (left, right -- res)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
@@ -151,20 +151,6 @@ dummy_func(void) {
         sym_set_type(nos, &PyFloat_Type);
     }
 
-    op(_GUARD_TOS_UNICODE, (tos -- tos)) {
-        if (sym_matches_type(tos, &PyUnicode_Type)) {
-            REPLACE_OP(this_instr, _NOP, 0, 0);
-        }
-        sym_set_type(tos, &PyUnicode_Type);
-    }
-
-    op(_GUARD_NOS_UNICODE, (nos, unused -- nos, unused)) {
-        if (sym_matches_type(nos, &PyUnicode_Type)) {
-            REPLACE_OP(this_instr, _NOP, 0, 0);
-        }
-        sym_set_type(nos, &PyUnicode_Type);
-    }
-
     op(_BINARY_OP, (left, right -- res)) {
         bool lhs_int = sym_matches_type(left, &PyLong_Type);
         bool rhs_int = sym_matches_type(right, &PyLong_Type);
@@ -410,6 +396,13 @@ dummy_func(void) {
         }
     }
 
+    op(_GUARD_NOS_UNICODE, (nos, unused -- nos, unused)) {
+        if (sym_matches_type(nos, &PyUnicode_Type)) {
+            REPLACE_OP(this_instr, _NOP, 0, 0);
+        }
+        sym_set_type(nos, &PyUnicode_Type);
+    }
+
     op(_GUARD_TOS_UNICODE, (value -- value)) {
         if (sym_matches_type(value, &PyUnicode_Type)) {
             REPLACE_OP(this_instr, _NOP, 0, 0);

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h