diff options
| author | Guido van Rossum <guido@python.org> | 2020-05-14 19:01:14 -0700 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2020-05-14 19:01:14 -0700 |
| commit | f93a54c48fc1644012aa0d4ee3887c1d121ac40e (patch) | |
| tree | 189c841245d15318e5895638105bdbc532cbcdf5 /Objects/genobject.c | |
| parent | 31641ff0e4b18c8d002d019f4506f0e8fb446983 (diff) | |
| parent | 16ab07063cb564c1937714bd39d6915172f005b5 (diff) | |
| download | cpython-git-fix-traceback-syntax-error.tar.gz | |
Merge branch 'master' into fix-traceback-syntax-errorfix-traceback-syntax-error
Diffstat (limited to 'Objects/genobject.c')
| -rw-r--r-- | Objects/genobject.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c index 5b253edfdc..fb01e581f8 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -217,6 +217,18 @@ 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); + } + gen->gi_running = 1; gen->gi_exc_state.previous_item = tstate->exc_info; tstate->exc_info = &gen->gi_exc_state; @@ -512,16 +524,6 @@ throw_here: } PyErr_Restore(typ, val, tb); - - _PyErr_StackItem *gi_exc_state = &gen->gi_exc_state; - if (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); - } return gen_send_ex(gen, Py_None, 1, 0); failed_throw: |