Visitar URL original
bpo-46409: Make generators in bytecode by markshannon · Pull Request #30633 · python/cpython · GitHub
Skip to content

bpo-46409: Make generators in bytecode #30633

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
markshannon merged 20 commits into from
Jan 20, 2022
Merged

bpo-46409: Make generators in bytecode #30633

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bf0394d
Add new instruction to make generator or coroutine from current frame.
markshannon Jan 17, 2022
23877ec
Set line number for RETURN_GENERATOR instruction.
markshannon Jan 17, 2022
381f3d3
Fix magic number
markshannon Jan 17, 2022
c2b141e
Remove unused code.
markshannon Jan 17, 2022
8b73d0d
Rename YIELD_FROM_LOOP to JUMP_NO_INTERRUPT: describe what it does, n…
markshannon Jan 17, 2022
7cb3dad
Document new bytecodes.
markshannon Jan 17, 2022
79b6d11
Add news
markshannon Jan 17, 2022
039b14d
Merge branch 'main' into make-gen-in-bytecode
markshannon Jan 17, 2022
c33abbf
Fix whitespace in opcode.py
markshannon Jan 17, 2022
d105cac
Trim frame and generator by word each.
markshannon Jan 18, 2022
e7c4bf2
Minor refactor of frame.c
markshannon Jan 18, 2022
c080089
Update test.test_sys to account for smaller frames.
markshannon Jan 18, 2022
1b177e3
Skip clearing of old frame when returning a generator.
markshannon Jan 18, 2022
243e441
Treat generator functions as normal functions when evaluating and spe…
markshannon Jan 18, 2022
a79e36b
Attempt to streamline eval-breaker checks a bit.
markshannon Jan 18, 2022
7392593
Revert change in test.
markshannon Jan 19, 2022
17b453a
Remove unused macro.
markshannon Jan 19, 2022
baa1009
Add some clarifications and explanations.
markshannon Jan 19, 2022
44d3f47
Name new instructions in news item.
markshannon Jan 20, 2022
06330b0
Use Py_NewRef
markshannon Jan 20, 2022
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
Rename YIELD_FROM_LOOP to JUMP_NO_INTERRUPT: describe what it does, n… 
…ot where it might be used.
  • Loading branch information
@markshannon
markshannon committed Jan 17, 2022
commit 8b73d0d02dbfe5f5397a80cfe9b643f5e69201ac
2 changes: 1 addition & 1 deletion Include/opcode.h
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Lib/opcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def jabs_op(name, op):
def_op('RAISE_VARARGS', 130) # Number of raise arguments (1, 2, or 3)
def_op('MAKE_FUNCTION', 132) # Flags
def_op('BUILD_SLICE', 133) # Number of items
jabs_op('YIELD_FROM_LOOP', 134) # Target byte offset from beginning of code
jabs_op('JUMP_NO_INTERRUPT', 134) # Target byte offset from beginning of code
def_op('MAKE_CELL', 135)
hasfree.append(135)
def_op('LOAD_CLOSURE', 136)
Expand Down
2 changes: 1 addition & 1 deletion Objects/frameobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
break;
}
case JUMP_ABSOLUTE:
case YIELD_FROM_LOOP:
case JUMP_NO_INTERRUPT:
j = get_arg(code, i);
assert(j < len);
if (stacks[j] == UNINITIALIZED && j < i) {
Expand Down
2 changes: 1 addition & 1 deletion Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4111,7 +4111,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
DISPATCH();
}

TARGET(YIELD_FROM_LOOP) {
TARGET(JUMP_NO_INTERRUPT) {
frame->f_state = FRAME_EXECUTING;
JUMPTO(oparg);
DISPATCH();
Expand Down
10 changes: 5 additions & 5 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ stack_effect(int opcode, int oparg, int jump)
/* Jumps */
case JUMP_FORWARD:
case JUMP_ABSOLUTE:
case YIELD_FROM_LOOP:
case JUMP_NO_INTERRUPT:
return 0;

case JUMP_IF_TRUE_OR_POP:
Expand Down Expand Up @@ -1845,7 +1845,7 @@ compiler_add_yield_from(struct compiler *c, int await)
ADDOP_JUMP(c, SEND, exit);
compiler_use_next_block(c, resume);
ADDOP_I(c, RESUME, await ? 3 : 2);
ADDOP_JUMP(c, YIELD_FROM_LOOP, start);
ADDOP_JUMP(c, JUMP_NO_INTERRUPT, start);
compiler_use_next_block(c, exit);
return 1;
}
Expand Down Expand Up @@ -7056,7 +7056,7 @@ stackdepth(struct compiler *c)
}
depth = new_depth;
if (instr->i_opcode == JUMP_ABSOLUTE ||
instr->i_opcode == YIELD_FROM_LOOP ||
instr->i_opcode == JUMP_NO_INTERRUPT ||
instr->i_opcode == JUMP_FORWARD ||
instr->i_opcode == RETURN_VALUE ||
instr->i_opcode == RAISE_VARARGS ||
Expand Down Expand Up @@ -8812,7 +8812,7 @@ normalize_basic_block(basicblock *bb) {
break;
case JUMP_ABSOLUTE:
case JUMP_FORWARD:
case YIELD_FROM_LOOP:
case JUMP_NO_INTERRUPT:
bb->b_nofallthrough = 1;
/* fall through */
case POP_JUMP_IF_NOT_NONE:
Expand Down Expand Up @@ -8997,7 +8997,7 @@ optimize_cfg(struct compiler *c, struct assembler *a, PyObject *consts)
if (b->b_iused > 0) {
struct instr *b_last_instr = &b->b_instr[b->b_iused - 1];
if (b_last_instr->i_opcode == JUMP_ABSOLUTE ||
b_last_instr->i_opcode == YIELD_FROM_LOOP ||
b_last_instr->i_opcode == JUMP_NO_INTERRUPT ||
b_last_instr->i_opcode == JUMP_FORWARD) {
if (b_last_instr->i_target == b->b_next) {
assert(b->b_next->b_iused);
Expand Down
2 changes: 1 addition & 1 deletion Python/opcode_targets.h
View file
Open in desktop

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