From 5c8e8704c39110da15956b0678303aff7dffb3be Mon Sep 17 00:00:00 2001 From: Dino Viehland Date: Wed, 26 Feb 2025 10:41:26 -0800 Subject: gh-130595: Keep traceback alive for WITH_EXCEPT_START (#130562) Keep traceback alive for WITH_EXCEPT_START --- Python/bytecodes.c | 6 ++---- Python/executor_cases.c.h | 10 ++++------ Python/generated_cases.c.h | 10 ++++------ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 6f91b10..9f13095 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -3297,13 +3297,10 @@ dummy_func( assert(val_o && PyExceptionInstance_Check(val_o)); exc = PyExceptionInstance_Class(val_o); - tb = PyException_GetTraceback(val_o); + PyObject *original_tb = tb = PyException_GetTraceback(val_o); if (tb == NULL) { tb = Py_None; } - else { - Py_DECREF(tb); - } assert(PyStackRef_LongCheck(lasti)); (void)lasti; // Shut up compiler warning if asserts are off PyObject *stack[5] = {NULL, PyStackRef_AsPyObjectBorrow(exit_self), exc, val_o, tb}; @@ -3311,6 +3308,7 @@ dummy_func( PyObject *res_o = PyObject_Vectorcall(exit_func_o, stack + 2 - has_self, (3 + has_self) | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); ERROR_IF(res_o == NULL, error); + Py_XDECREF(original_tb); res = PyStackRef_FromPyObjectSteal(res_o); } diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 9520bc8..5468fc4 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -4426,15 +4426,10 @@ PyObject *exit_func_o = PyStackRef_AsPyObjectBorrow(exit_func); assert(val_o && PyExceptionInstance_Check(val_o)); exc = PyExceptionInstance_Class(val_o); - tb = PyException_GetTraceback(val_o); + PyObject *original_tb = tb = PyException_GetTraceback(val_o); if (tb == NULL) { tb = Py_None; } - else { - _PyFrame_SetStackPointer(frame, stack_pointer); - Py_DECREF(tb); - stack_pointer = _PyFrame_GetStackPointer(frame); - } assert(PyStackRef_LongCheck(lasti)); (void)lasti; // Shut up compiler warning if asserts are off PyObject *stack[5] = {NULL, PyStackRef_AsPyObjectBorrow(exit_self), exc, val_o, tb}; @@ -4446,6 +4441,9 @@ if (res_o == NULL) { JUMP_TO_ERROR(); } + _PyFrame_SetStackPointer(frame, stack_pointer); + Py_XDECREF(original_tb); + stack_pointer = _PyFrame_GetStackPointer(frame); res = PyStackRef_FromPyObjectSteal(res_o); stack_pointer[0] = res; stack_pointer += 1; diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 377be6f..311faf3 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -11845,15 +11845,10 @@ PyObject *exit_func_o = PyStackRef_AsPyObjectBorrow(exit_func); assert(val_o && PyExceptionInstance_Check(val_o)); exc = PyExceptionInstance_Class(val_o); - tb = PyException_GetTraceback(val_o); + PyObject *original_tb = tb = PyException_GetTraceback(val_o); if (tb == NULL) { tb = Py_None; } - else { - _PyFrame_SetStackPointer(frame, stack_pointer); - Py_DECREF(tb); - stack_pointer = _PyFrame_GetStackPointer(frame); - } assert(PyStackRef_LongCheck(lasti)); (void)lasti; // Shut up compiler warning if asserts are off PyObject *stack[5] = {NULL, PyStackRef_AsPyObjectBorrow(exit_self), exc, val_o, tb}; @@ -11865,6 +11860,9 @@ if (res_o == NULL) { JUMP_TO_LABEL(error); } + _PyFrame_SetStackPointer(frame, stack_pointer); + Py_XDECREF(original_tb); + stack_pointer = _PyFrame_GetStackPointer(frame); res = PyStackRef_FromPyObjectSteal(res_o); stack_pointer[0] = res; stack_pointer += 1; -- cgit v0.12