diff options
| author | Mark Shannon <mark@hotpy.org> | 2017-10-22 21:41:51 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <pitrou@free.fr> | 2017-10-22 21:41:51 (GMT) |
| commit | ae3087c6382011c47db82fea4d05f8bbf514265d (patch) | |
| tree | c5d832a760d9898700f1ca397a5a305734b3d77a /Python/pystate.c | |
| parent | 91dc64ba3f51100540b2ab6c6cd72c3bb18a6d49 (diff) | |
| download | cpython-ae3087c6382011c47db82fea4d05f8bbf514265d.zip cpython-ae3087c6382011c47db82fea4d05f8bbf514265d.tar.gz cpython-ae3087c6382011c47db82fea4d05f8bbf514265d.tar.bz2 | |
Move exc state to generator. Fixes bpo-25612 (#1773)
Move exception state information from frame objects to coroutine (generator/thread) object where it belongs.
Diffstat (limited to 'Python/pystate.c')
| -rw-r--r-- | Python/pystate.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 3feae34..d85d604 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -257,9 +257,11 @@ new_threadstate(PyInterpreterState *interp, int init) tstate->curexc_value = NULL; tstate->curexc_traceback = NULL; - tstate->exc_type = NULL; - tstate->exc_value = NULL; - tstate->exc_traceback = NULL; + tstate->exc_state.exc_type = NULL; + tstate->exc_state.exc_value = NULL; + tstate->exc_state.exc_traceback = NULL; + tstate->exc_state.previous_item = NULL; + tstate->exc_info = &tstate->exc_state; tstate->c_profilefunc = NULL; tstate->c_tracefunc = NULL; @@ -444,9 +446,16 @@ PyThreadState_Clear(PyThreadState *tstate) Py_CLEAR(tstate->curexc_value); Py_CLEAR(tstate->curexc_traceback); - Py_CLEAR(tstate->exc_type); - Py_CLEAR(tstate->exc_value); - Py_CLEAR(tstate->exc_traceback); + Py_CLEAR(tstate->exc_state.exc_type); + Py_CLEAR(tstate->exc_state.exc_value); + Py_CLEAR(tstate->exc_state.exc_traceback); + + /* The stack of exception states should contain just this thread. */ + assert(tstate->exc_info->previous_item == NULL); + if (Py_VerboseFlag && tstate->exc_info != &tstate->exc_state) { + fprintf(stderr, + "PyThreadState_Clear: warning: thread still has a generator\n"); + } tstate->c_profilefunc = NULL; tstate->c_tracefunc = NULL; |