gh-128955: Fix goto if tlbc creation fails when throwing into a generator (#128957)

mpage · web-flow · commit 13c4def69222 · 2025-01-17T12:53:29.000-08:00
We don't have the correct copy of the bytecode and can't update next_instr
appropriately, so just unwind.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -846,7 +846,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             _Py_CODEUNIT *bytecode =
                 _PyEval_GetExecutableCode(tstate, _PyFrame_GetCode(frame));
             if (bytecode == NULL) {
-                goto error;
+                goto exit_unwind;
             }
             ptrdiff_t off = frame->instr_ptr - _PyFrame_GetBytecode(frame);
             frame->tlbc_index = ((_PyThreadStateImpl *)tstate)->tlbc_index;

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int`
`846`	`846`	`_Py_CODEUNIT *bytecode =`
`847`	`847`	`_PyEval_GetExecutableCode(tstate, _PyFrame_GetCode(frame));`
`848`	`848`	`if (bytecode == NULL) {`
`849`		`- goto error;`
	`849`	`+ goto exit_unwind;`
`850`	`850`	`}`
`851`	`851`	`ptrdiff_t off = frame->instr_ptr - _PyFrame_GetBytecode(frame);`
`852`	`852`	`frame->tlbc_index = ((_PyThreadStateImpl *)tstate)->tlbc_index;`