mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-98831: rewrite RERAISE and CLEANUP_THROW in the instruction definition DSL (#101511)

Browse source
This commit is contained in:
Irit Katriel 2023-02-02 10:02:57 +00:00 • committed by GitHub
parent ee21110086
commit 0675b8f032
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Python/bytecodes.c
View file

@ -739,10 +739,10 @@ dummy_func(
Py_XSETREF(exc_info->exc_value, exc_value);
}
// stack effect: (__0 -- )
inst(RERAISE) {
inst(RERAISE, (values[oparg], exc -- values[oparg])) {
assert(oparg >= 0 && oparg <= 2);
if (oparg) {
PyObject *lasti = PEEK(oparg + 1);
PyObject *lasti = values[0];
if (PyLong_Check(lasti)) {
frame->prev_instr = _PyCode_CODE(frame->f_code) + PyLong_AsLong(lasti);
assert(!_PyErr_Occurred(tstate));
@ -753,11 +753,11 @@ dummy_func(
goto error;
}
}
PyObject *val = POP();
assert(val && PyExceptionInstance_Check(val));
PyObject *exc = Py_NewRef(PyExceptionInstance_Class(val));
PyObject *tb = PyException_GetTraceback(val);
_PyErr_Restore(tstate, exc, val, tb);
assert(exc && PyExceptionInstance_Check(exc));
Py_INCREF(exc);
PyObject *typ = Py_NewRef(PyExceptionInstance_Class(exc));
PyObject *tb = PyException_GetTraceback(exc);
_PyErr_Restore(tstate, typ, exc, tb);
goto exception_unwind;
}
@ -784,18 +784,12 @@ dummy_func(
}
}
// stack effect: (__0, __1 -- )
inst(CLEANUP_THROW) {
inst(CLEANUP_THROW, (sub_iter, last_sent_val, exc_value -- value)) {
assert(throwflag);
PyObject *exc_value = TOP();
assert(exc_value && PyExceptionInstance_Check(exc_value));
if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
PyObject *value = ((PyStopIterationObject *)exc_value)->value;
Py_INCREF(value);
Py_DECREF(POP()); // The StopIteration.
Py_DECREF(POP()); // The last sent value.
Py_DECREF(POP()); // The delegated sub-iterator.
PUSH(value);
value = Py_NewRef(((PyStopIterationObject *)exc_value)->value);
DECREF_INPUTS();
}
else {
PyObject *exc_type = Py_NewRef(Py_TYPE(exc_value));