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

brandtbucher · web-flow · commit 6971e40c2e02 · 2023-09-06T13:59:50.000-07:00
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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a crash when running with :envvar:`PYTHONUOPS` or :option:`-X uops <-X>`
	`2`	`+enabled and an error occurs during optimization.`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ _PyOptimizer_BackEdge(_PyInterpreterFrame frame, _Py_CODEUNIT src, _Py_CODEUNI`
`169`	`169`	`if (err <= 0) {`
`170`	`170`	`assert(executor == NULL);`
`171`	`171`	`if (err < 0) {`
	`172`	`+ _PyFrame_SetStackPointer(frame, stack_pointer);`
`172`	`173`	`return NULL;`
`173`	`174`	`}`
`174`	`175`	`goto jump_to_destination;`