Merge remote-tracking branch 'upstream/main' into gh-116168-remove-ex…

…tra-_check_stack_space-ops
python · gvanrossum · Apr 3, 2024 · Mar 21, 2024 · Mar 26, 2024 · Mar 26, 2024
commit 781590d05191eb2c338701d24ca97248c418479a
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
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
@@ -671,8 +671,8 @@ combine_stack_space_checks(
             }
         }
     }
-    // must only return due to _EXIT_TRACE
-    assert(false);
+    Py_FatalError("No terminating instruction");
-    Py_FatalError("No terminating instruction");
-    Py_FatalError("No terminating instruction");
+    Py_UNREACHABLE();
 }
 
 //  0 - failure, no error raised, just fall back to Tier 1
@@ -704,8 +704,9 @@ _Py_uop_analyze_and_optimize(
         return length;
     }
 
-    remove_unneeded_uops(buffer, buffer_size);
     combine_stack_space_checks(buffer, buffer_size);
+    length = remove_unneeded_uops(buffer, length);
+    assert(length > 0);
 
     OPT_STAT_INC(optimizer_successes);
     return length;