mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-23 15:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-45711: assert that the type of exc_info is redundant (GH-29518)

Browse source
This commit is contained in:
Irit Katriel 2021-11-12 21:37:26 +00:00 • committed by GitHub
parent 9d32714384
commit de3db1448b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Python/ceval.c
View file

@ -1058,6 +1058,23 @@ fail:
static int do_raise(PyThreadState *tstate, PyObject *exc, PyObject *cause); static int do_raise(PyThreadState *tstate, PyObject *exc, PyObject *cause);
static int unpack_iterable(PyThreadState *, PyObject *, int, int, PyObject **); static int unpack_iterable(PyThreadState *, PyObject *, int, int, PyObject **);
#ifdef Py_DEBUG
static void
_assert_exception_type_is_redundant(PyObject* type, PyObject* val)
{
if (type == NULL || type == Py_None) {
assert(val == NULL || val == Py_None);
}
else {
assert(PyExceptionInstance_Check(val));
assert(PyExceptionInstance_Class(val) == type);
}
}
#define ASSERT_EXC_TYPE_IS_REDUNDANT(t, v) _assert_exception_type_is_redundant(t, v)
#else
#define ASSERT_EXC_TYPE_IS_REDUNDANT(t, v)
#endif
PyObject * PyObject *
PyEval_EvalCode(PyObject *co, PyObject *globals, PyObject *locals) PyEval_EvalCode(PyObject *co, PyObject *globals, PyObject *locals)
@ -2476,6 +2493,7 @@ check_eval_breaker:
exc_info->exc_type = POP(); exc_info->exc_type = POP();
exc_info->exc_value = POP(); exc_info->exc_value = POP();
exc_info->exc_traceback = POP(); exc_info->exc_traceback = POP();
ASSERT_EXC_TYPE_IS_REDUNDANT(exc_info->exc_type, exc_info->exc_value);
Py_XDECREF(type); Py_XDECREF(type);
Py_XDECREF(value); Py_XDECREF(value);
Py_XDECREF(traceback); Py_XDECREF(traceback);
@ -2497,6 +2515,7 @@ check_eval_breaker:
type = POP(); type = POP();
value = POP(); value = POP();
traceback = POP(); traceback = POP();
ASSERT_EXC_TYPE_IS_REDUNDANT(type, value);
Py_DECREF(POP()); /* lasti */ Py_DECREF(POP()); /* lasti */
_PyErr_Restore(tstate, type, value, traceback); _PyErr_Restore(tstate, type, value, traceback);
exc_info = tstate->exc_info; exc_info = tstate->exc_info;
@ -2506,6 +2525,7 @@ check_eval_breaker:
exc_info->exc_type = POP(); exc_info->exc_type = POP();
exc_info->exc_value = POP(); exc_info->exc_value = POP();
exc_info->exc_traceback = POP(); exc_info->exc_traceback = POP();
ASSERT_EXC_TYPE_IS_REDUNDANT(exc_info->exc_type, exc_info->exc_value);
Py_XDECREF(type); Py_XDECREF(type);
Py_XDECREF(value); Py_XDECREF(value);
Py_XDECREF(traceback); Py_XDECREF(traceback);
@ -2528,6 +2548,7 @@ check_eval_breaker:
PyObject *exc = POP(); PyObject *exc = POP();
PyObject *val = POP(); PyObject *val = POP();
PyObject *tb = POP(); PyObject *tb = POP();
ASSERT_EXC_TYPE_IS_REDUNDANT(exc, val);
assert(PyExceptionClass_Check(exc)); assert(PyExceptionClass_Check(exc));
_PyErr_Restore(tstate, exc, val, tb); _PyErr_Restore(tstate, exc, val, tb);
goto exception_unwind; goto exception_unwind;
@ -2537,6 +2558,7 @@ check_eval_breaker:
PyObject *exc = POP(); PyObject *exc = POP();
PyObject *val = POP(); PyObject *val = POP();
PyObject *tb = POP(); PyObject *tb = POP();
ASSERT_EXC_TYPE_IS_REDUNDANT(exc, val);
assert(PyExceptionClass_Check(exc)); assert(PyExceptionClass_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) { if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
Py_DECREF(exc); Py_DECREF(exc);
@ -3991,6 +4013,7 @@ check_eval_breaker:
exc = TOP(); exc = TOP();
val = SECOND(); val = SECOND();
tb = THIRD(); tb = THIRD();
ASSERT_EXC_TYPE_IS_REDUNDANT(exc, val);
assert(!Py_IsNone(exc)); assert(!Py_IsNone(exc));
assert(!PyLong_Check(exc)); assert(!PyLong_Check(exc));
assert(PyLong_Check(PEEK(7))); assert(PyLong_Check(PEEK(7)));
@ -4009,6 +4032,7 @@ check_eval_breaker:
PyObject *type = TOP(); PyObject *type = TOP();
PyObject *value = SECOND(); PyObject *value = SECOND();
PyObject *tb = THIRD(); PyObject *tb = THIRD();
ASSERT_EXC_TYPE_IS_REDUNDANT(type, value);
_PyErr_StackItem *exc_info = tstate->exc_info; _PyErr_StackItem *exc_info = tstate->exc_info;
SET_THIRD(exc_info->exc_traceback); SET_THIRD(exc_info->exc_traceback);
SET_SECOND(exc_info->exc_value); SET_SECOND(exc_info->exc_value);
@ -4990,6 +5014,7 @@ exception_unwind:
PUSH(tb); PUSH(tb);
PUSH(val); PUSH(val);
PUSH(exc); PUSH(exc);
ASSERT_EXC_TYPE_IS_REDUNDANT(exc, val);
JUMPTO(handler); JUMPTO(handler);
/* Resume normal execution */ /* Resume normal execution */
frame->f_state = FRAME_EXECUTING; frame->f_state = FRAME_EXECUTING;