Skip to content
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

Jump to bottom

gh-98831: rewrite BEFORE_ASYNC_WITH and END_ASYNC_FOR in the instruction definition DSL #101458

Merged
merged 1 commit into from
Jan 31, 2023
Merged

gh-98831: rewrite BEFORE_ASYNC_WITH and END_ASYNC_FOR in the instruction definition DSL #101458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 15 additions & 20 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,18 +770,16 @@ dummy_func(
ERROR_IF(val == NULL, error);
}

// stack effect: (__0, __1 -- )
inst(END_ASYNC_FOR) {
PyObject *val = POP();
assert(val && PyExceptionInstance_Check(val));
if (PyErr_GivenExceptionMatches(val, PyExc_StopAsyncIteration)) {
Py_DECREF(val);
Py_DECREF(POP());
inst(END_ASYNC_FOR, (awaitable, exc -- )) {
assert(exc && PyExceptionInstance_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
DECREF_INPUTS();
}
else {
PyObject *exc = Py_NewRef(PyExceptionInstance_Class(val));
PyObject *tb = PyException_GetTraceback(val);
_PyErr_Restore(tstate, exc, val, tb);
Py_INCREF(exc);
PyObject *typ = Py_NewRef(PyExceptionInstance_Class(exc));
PyObject *tb = PyException_GetTraceback(exc);
_PyErr_Restore(tstate, typ, exc, tb);
goto exception_unwind;
}
}
Expand Down Expand Up @@ -2266,10 +2264,7 @@ dummy_func(
DISPATCH_INLINED(gen_frame);
}

// stack effect: ( -- __0)
inst(BEFORE_ASYNC_WITH) {
PyObject *mgr = TOP();
PyObject *res;
inst(BEFORE_ASYNC_WITH, (mgr -- exit, res)) {
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
Expand All @@ -2280,7 +2275,7 @@ dummy_func(
}
goto error;
}
PyObject *exit = _PyObject_LookupSpecial(mgr, &_Py_ID(__aexit__));
exit = _PyObject_LookupSpecial(mgr, &_Py_ID(__aexit__));
if (exit == NULL) {
if (!_PyErr_Occurred(tstate)) {
_PyErr_Format(tstate, PyExc_TypeError,
Expand All @@ -2292,13 +2287,13 @@ dummy_func(
Py_DECREF(enter);
goto error;
}
SET_TOP(exit);
Py_DECREF(mgr);
DECREF_INPUTS();
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL)
goto error;
PUSH(res);
if (res == NULL) {
Py_DECREF(exit);
ERROR_IF(true, error);
}
PREDICT(GET_AWAITABLE);
}

Expand Down
35 changes: 21 additions & 14 deletions Python/generated_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Python/opcode_metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ _PyOpcode_num_popped(int opcode, int oparg) {
case PREP_RERAISE_STAR:
return 2;
case END_ASYNC_FOR:
return -1;
return 2;
case CLEANUP_THROW:
return -1;
case LOAD_ASSERTION_ERROR:
Expand Down Expand Up @@ -271,7 +271,7 @@ _PyOpcode_num_popped(int opcode, int oparg) {
case FOR_ITER_GEN:
return -1;
case BEFORE_ASYNC_WITH:
return -1;
return 1;
case BEFORE_WITH:
return 1;
case WITH_EXCEPT_START:
Expand Down Expand Up @@ -455,7 +455,7 @@ _PyOpcode_num_pushed(int opcode, int oparg) {
case PREP_RERAISE_STAR:
return 1;
case END_ASYNC_FOR:
return -1;
return 0;
case CLEANUP_THROW:
return -1;
case LOAD_ASSERTION_ERROR:
Expand Down Expand Up @@ -617,7 +617,7 @@ _PyOpcode_num_pushed(int opcode, int oparg) {
case FOR_ITER_GEN:
return -1;
case BEFORE_ASYNC_WITH:
return -1;
return 2;
case BEFORE_WITH:
return 2;
case WITH_EXCEPT_START:
Expand Down