From bfaa13ca2f37ccc69a691ea785dcb1a8ce0da14f Mon Sep 17 00:00:00 2001 From: Chris Jerdonek Date: Mon, 18 May 2020 04:46:14 -0700 Subject: [PATCH] Use _PyErr_ChainStackItem() inside gen_send_ex(). _PyErr_ChainStackItem was just added in GH-19951 (for bpo-31033). --- Objects/genobject.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Objects/genobject.c b/Objects/genobject.c index 40179cdbf7dbd2..271720bdf8b4ce 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -203,16 +203,8 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing) assert(f->f_back == NULL); f->f_back = tstate->frame; - _PyErr_StackItem *gi_exc_state = &gen->gi_exc_state; - if (exc && gi_exc_state->exc_type != NULL && - gi_exc_state->exc_type != Py_None) - { - Py_INCREF(gi_exc_state->exc_type); - Py_XINCREF(gi_exc_state->exc_value); - Py_XINCREF(gi_exc_state->exc_traceback); - _PyErr_ChainExceptions(gi_exc_state->exc_type, - gi_exc_state->exc_value, - gi_exc_state->exc_traceback); + if (exc) { + _PyErr_ChainStackItem(&gen->gi_exc_state); } gen->gi_running = 1;