Skip to content

GH-112354: END_FOR instruction to only pop one value. #114247

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 8 commits into from
Jan 24, 2024
Merged

GH-112354: END_FOR instruction to only pop one value. #114247

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70e9dfd
END_FOR instruction only pops one value. Compiler emits END_FOR; POP_…
markshannon Jan 17, 2024
ed98265
Add news
markshannon Jan 17, 2024
a3779ab
Merge branch 'main' into split-end-for
markshannon Jan 17, 2024
aece1df
Add explanatory comment
markshannon Jan 17, 2024
a6dbad9
Merge branch 'main' into split-end-for
markshannon Jan 18, 2024
81c64b6
Update docs for END_FOR
markshannon Jan 18, 2024
96a9a8e
Add workaround
markshannon Jan 18, 2024
0079ed1
more workarounds
markshannon Jan 18, 2024
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
Add explanatory comment
  • Loading branch information
@markshannon
markshannon committed Jan 17, 2024
commit aece1df807ece25d16b5a77fc80680e16be96e7c
8 changes: 8 additions & 0 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3075,6 +3075,10 @@ compiler_for(struct compiler *c, stmt_ty s)
ADDOP_JUMP(c, NO_LOCATION, JUMP, start);

USE_LABEL(c, cleanup);
/* It is important for instrumentation that the `END_FOR` comes first.
* Iteration over a generator will jump to the first of these instructions,
* but a non-generator will jump to a later instruction.
*/
ADDOP(c, NO_LOCATION, END_FOR);
ADDOP(c, NO_LOCATION, POP_TOP);

Expand Down Expand Up @@ -5391,6 +5395,10 @@ compiler_sync_comprehension_generator(struct compiler *c, location loc,
ADDOP_JUMP(c, elt_loc, JUMP, start);

USE_LABEL(c, anchor);
/* It is important for instrumentation that the `END_FOR` comes first.
* Iteration over a generator will jump to the first of these instructions,
* but a non-generator will jump to a later instruction.
*/
ADDOP(c, NO_LOCATION, END_FOR);
ADDOP(c, NO_LOCATION, POP_TOP);
}
Expand Down