1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

32
Python/generated_cases.c.h generated
View File

@ -945,8 +945,11 @@
} }
TARGET(RERAISE) { TARGET(RERAISE) {
PyObject *exc = PEEK(1);
PyObject **values = &PEEK(1 + oparg);
assert(oparg >= 0 && oparg <= 2);
if (oparg) { if (oparg) {
PyObject *lasti = PEEK(oparg + 1); PyObject *lasti = values[0];
if (PyLong_Check(lasti)) { if (PyLong_Check(lasti)) {
frame->prev_instr = _PyCode_CODE(frame->f_code) + PyLong_AsLong(lasti); frame->prev_instr = _PyCode_CODE(frame->f_code) + PyLong_AsLong(lasti);
assert(!_PyErr_Occurred(tstate)); assert(!_PyErr_Occurred(tstate));
@ -957,11 +960,11 @@
goto error; goto error;
} }
} }
PyObject *val = POP(); assert(exc && PyExceptionInstance_Check(exc));
assert(val && PyExceptionInstance_Check(val)); Py_INCREF(exc);
PyObject *exc = Py_NewRef(PyExceptionInstance_Class(val)); PyObject *typ = Py_NewRef(PyExceptionInstance_Class(exc));
PyObject *tb = PyException_GetTraceback(val); PyObject *tb = PyException_GetTraceback(exc);
_PyErr_Restore(tstate, exc, val, tb); _PyErr_Restore(tstate, typ, exc, tb);
goto exception_unwind; goto exception_unwind;
} }
@ -1001,16 +1004,17 @@
} }
TARGET(CLEANUP_THROW) { TARGET(CLEANUP_THROW) {
PyObject *exc_value = PEEK(1);
PyObject *last_sent_val = PEEK(2);
PyObject *sub_iter = PEEK(3);
PyObject *value;
assert(throwflag); assert(throwflag);
PyObject *exc_value = TOP();
assert(exc_value && PyExceptionInstance_Check(exc_value)); assert(exc_value && PyExceptionInstance_Check(exc_value));
if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) { if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
PyObject *value = ((PyStopIterationObject *)exc_value)->value; value = Py_NewRef(((PyStopIterationObject *)exc_value)->value);
Py_INCREF(value); Py_DECREF(sub_iter);
Py_DECREF(POP()); // The StopIteration. Py_DECREF(last_sent_val);
Py_DECREF(POP()); // The last sent value. Py_DECREF(exc_value);
Py_DECREF(POP()); // The delegated sub-iterator.
PUSH(value);
} }
else { else {
PyObject *exc_type = Py_NewRef(Py_TYPE(exc_value)); PyObject *exc_type = Py_NewRef(Py_TYPE(exc_value));
@ -1018,6 +1022,8 @@
_PyErr_Restore(tstate, exc_type, Py_NewRef(exc_value), exc_traceback); _PyErr_Restore(tstate, exc_type, Py_NewRef(exc_value), exc_traceback);
goto exception_unwind; goto exception_unwind;
} }
STACK_SHRINK(2);
POKE(1, value);
DISPATCH(); DISPATCH();
} }

8
Python/opcode_metadata.h
View File

@ -105,13 +105,13 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
case POP_EXCEPT: case POP_EXCEPT:
return 1; return 1;
case RERAISE: case RERAISE:
return -1; return oparg + 1;
case PREP_RERAISE_STAR: case PREP_RERAISE_STAR:
return 2; return 2;
case END_ASYNC_FOR: case END_ASYNC_FOR:
return 2; return 2;
case CLEANUP_THROW: case CLEANUP_THROW:
return -1; return 3;
case LOAD_ASSERTION_ERROR: case LOAD_ASSERTION_ERROR:
return 0; return 0;
case LOAD_BUILD_CLASS: case LOAD_BUILD_CLASS:
@ -451,13 +451,13 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case POP_EXCEPT: case POP_EXCEPT:
return 0; return 0;
case RERAISE: case RERAISE:
return -1; return oparg;
case PREP_RERAISE_STAR: case PREP_RERAISE_STAR:
return 1; return 1;
case END_ASYNC_FOR: case END_ASYNC_FOR:
return 0; return 0;
case CLEANUP_THROW: case CLEANUP_THROW:
return -1; return 1;
case LOAD_ASSERTION_ERROR: case LOAD_ASSERTION_ERROR:
return 1; return 1;
case LOAD_BUILD_CLASS: case LOAD_BUILD_CLASS: