diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-15 17:25:54 +0100 |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-15 17:25:54 +0100 |
| commit | 84dd5e2ab0c02dbdfa79a99a5b8d2646fa8984d1 (patch) | |
| tree | d9487974517ab21639b1c869eea7743d8355e44a /Python/errors.c | |
| parent | 84e6bd64dd98985c415420d7615077ff7a7cd4ac (diff) | |
| parent | 22454df994214799dddfc7e7aaf96fae51f002a9 (diff) | |
| download | cpython-84dd5e2ab0c02dbdfa79a99a5b8d2646fa8984d1.tar.gz | |
Issue #26929: Merge 3.6
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c index 918f4dffab..d459fae622 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -158,10 +158,10 @@ PyErr_SetString(PyObject *exception, const char *string) } -PyObject * +PyObject* _Py_HOT_FUNCTION PyErr_Occurred(void) { - PyThreadState *tstate = _PyThreadState_UncheckedGet(); + PyThreadState *tstate = PyThreadState_GET(); return tstate == NULL ? NULL : tstate->curexc_type; } |