Skip to content

bpo-45711: use exc_value instead of exc_type to determine if exc_info is valid. Add more assertions. #29627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 7 commits into from
Nov 25, 2021
Merged

bpo-45711: use exc_value instead of exc_type to determine if exc_info is valid. Add more assertions. #29627

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9275583
bpo-45711: make decisions based on exc_value instead of exc_type. Str…
iritkatriel Nov 18, 2021
fbff4f6
put assertion definition under Py_DEBUG to remove Address sanitizer w…
iritkatriel Nov 19, 2021
bc889bc
Merge remote-tracking branch 'upstream/main' into bpo-45711-remove-ex…
iritkatriel Nov 22, 2021
3c451a1
err_info->exc_value ==> exc_value
iritkatriel Nov 24, 2021
277c509
Simplified _PyErr_GetExcInfo. Moved assertion in _PyErr_GetTopmostExc…
iritkatriel Nov 24, 2021
437cebb
exc2 --> typ2
iritkatriel Nov 24, 2021
de67ed6
exc --> typ
iritkatriel Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
exc2 --> typ2
  • Loading branch information
@iritkatriel
iritkatriel committed Nov 24, 2021
commit 437cebba2e8220e1766ee51bb9ee8fc842bee337
18 changes: 9 additions & 9 deletions Python/errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,17 +568,17 @@ _PyErr_ChainExceptions(PyObject *exc, PyObject *val, PyObject *tb)
}

if (_PyErr_Occurred(tstate)) {
PyObject *exc2, *val2, *tb2;
_PyErr_Fetch(tstate, &exc2, &val2, &tb2);
PyObject *typ2, *val2, *tb2;
_PyErr_Fetch(tstate, &typ2, &val2, &tb2);
_PyErr_NormalizeException(tstate, &exc, &val, &tb);
if (tb != NULL) {
PyException_SetTraceback(val, tb);
Py_DECREF(tb);
}
Py_DECREF(exc);
_PyErr_NormalizeException(tstate, &exc2, &val2, &tb2);
_PyErr_NormalizeException(tstate, &typ2, &val2, &tb2);
PyException_SetContext(val2, val);
_PyErr_Restore(tstate, exc2, val2, tb2);
_PyErr_Restore(tstate, typ2, val2, tb2);
}
else {
_PyErr_Restore(tstate, exc, val, tb);
Expand Down Expand Up @@ -625,19 +625,19 @@ _PyErr_ChainStackItem(_PyErr_StackItem *exc_info)
PyObject *exc, *val, *tb;
_PyErr_Fetch(tstate, &exc, &val, &tb);

PyObject *exc2, *val2, *tb2;
exc2 = exc_info->exc_type;
PyObject *typ2, *val2, *tb2;
typ2 = exc_info->exc_type;
val2 = exc_info->exc_value;
tb2 = exc_info->exc_traceback;
#ifdef Py_DEBUG
PyObject *exc2_before = exc2;
PyObject *typ2_before = typ2;
PyObject *val2_before = val2;
PyObject *tb2_before = tb2;
#endif
_PyErr_NormalizeException(tstate, &exc2, &val2, &tb2);
_PyErr_NormalizeException(tstate, &typ2, &val2, &tb2);
#ifdef Py_DEBUG
/* exc_info should already be normalized */
assert(exc2 == exc2_before);
assert(typ2 == typ2_before);
assert(val2 == val2_before);
assert(tb2 == tb2_before);
#endif
Expand Down