e89f95bfd0
If we have a chain of generators/coroutines that are 'yield from'ing
each other, then resuming the stack works like:
- call send() on the outermost generator
- this enters _PyEval_EvalFrameDefault, which re-executes the
YIELD_FROM opcode
- which calls send() on the next generator
- which enters _PyEval_EvalFrameDefault, which re-executes the
YIELD_FROM opcode
- ...etc.
However, every time we enter _PyEval_EvalFrameDefault, the first thing
we do is to check for pending signals, and if there are any then we
run the signal handler. And if it raises an exception, then we
immediately propagate that exception *instead* of starting to execute
bytecode. This means that e.g. a SIGINT at the wrong moment can "break
the chain" – it can be raised in the middle of our yield from chain,
with the bottom part of the stack abandoned for the garbage collector.
The fix is pretty simple: there's already a special case in
_PyEval_EvalFrameEx where it skips running signal handlers if the next
opcode is SETUP_FINALLY. (I don't see how this accomplishes anything
useful, but that's another story.) If we extend this check to also
skip running signal handlers when the next opcode is YIELD_FROM, then
that closes the hole – now the exception can only be raised at the
innermost stack frame.
This shouldn't have any performance implications, because the opcode
check happens inside the "slow path" after we've already determined
that there's a pending signal or something similar for us to process;
the vast majority of the time this isn't true and the new check
doesn't run at all..
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| clinic | ||
| Python-ast.c | ||
| README | ||
| _warnings.c | ||
| asdl.c | ||
| ast.c | ||
| bltinmodule.c | ||
| ceval.c | ||
| ceval_gil.h | ||
| codecs.c | ||
| compile.c | ||
| condvar.h | ||
| dtoa.c | ||
| dup2.c | ||
| dynamic_annotations.c | ||
| dynload_aix.c | ||
| dynload_dl.c | ||
| dynload_hpux.c | ||
| dynload_next.c | ||
| dynload_shlib.c | ||
| dynload_stub.c | ||
| dynload_win.c | ||
| errors.c | ||
| fileutils.c | ||
| formatter_unicode.c | ||
| frozen.c | ||
| frozenmain.c | ||
| future.c | ||
| getargs.c | ||
| getcompiler.c | ||
| getcopyright.c | ||
| getopt.c | ||
| getplatform.c | ||
| getversion.c | ||
| graminit.c | ||
| import.c | ||
| importdl.c | ||
| importdl.h | ||
| importlib.h | ||
| importlib_external.h | ||
| makeopcodetargets.py | ||
| marshal.c | ||
| modsupport.c | ||
| mysnprintf.c | ||
| mystrtoul.c | ||
| opcode_targets.h | ||
| peephole.c | ||
| pyarena.c | ||
| pyctype.c | ||
| pyfpe.c | ||
| pyhash.c | ||
| pylifecycle.c | ||
| pymath.c | ||
| pystate.c | ||
| pystrcmp.c | ||
| pystrhex.c | ||
| pystrtod.c | ||
| pythonrun.c | ||
| pytime.c | ||
| random.c | ||
| sigcheck.c | ||
| strdup.c | ||
| structmember.c | ||
| symtable.c | ||
| sysmodule.c | ||
| thread.c | ||
| thread_foobar.h | ||
| thread_nt.h | ||
| thread_pthread.h | ||
| traceback.c | ||
| wordcode_helpers.h | ||
README
Miscellaneous source files for the main Python shared library