GH-104584: Restore frame->stacktop on optimizer error (GH-108953)

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-05-11-31-27.gh-issue-104584.IRSXA2.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-05-11-31-27.gh-issue-104584.IRSXA2.rst
new file mode 100644 (file)
index 0000000..7f556bf
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-09-05-11-31-27.gh-issue-104584.IRSXA2.rst
@@ -0,0 +1,2 @@
+Fix a crash when running with :envvar:`PYTHONUOPS` or :option:`-X uops <-X>`
+enabled and an error occurs during optimization.

diff --git a/Python/optimizer.c b/Python/optimizer.c
index 8aaf9f9fd7cb1454216daf64b428af4f6c3767ef..c6d0f9e5bf22d7df640d21e2fc7b22c9bb31cfed 100644 (file)
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -169,6 +169,7 @@ _PyOptimizer_BackEdge(_PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNI
     if (err <= 0) {
         assert(executor == NULL);
         if (err < 0) {
+            _PyFrame_SetStackPointer(frame, stack_pointer);
             return NULL;
         }
         goto jump_to_destination;