Skip to content

gh-102859: Remove JUMP_IF_FALSE_OR_POP and JUMP_IF_TRUE_OR_POP #102870

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
iritkatriel merged 9 commits into from
Mar 22, 2023
Merged

gh-102859: Remove JUMP_IF_FALSE_OR_POP and JUMP_IF_TRUE_OR_POP #102870

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e63ce0
gh-102859: remove opcodes JUMP_IF_FALSE_OR_POP and JUMP_IF_TRUE_OR_POP
iritkatriel Mar 21, 2023
96602a0
add news
iritkatriel Mar 21, 2023
22ed3a6
fix peepholer
iritkatriel Mar 21, 2023
08c0826
Merge remote-tracking branch 'upstream/main' into remove-JUMP_IF_FALS…
iritkatriel Mar 21, 2023
0097e54
fix optimizations
iritkatriel Mar 21, 2023
12595f6
init 'target'
iritkatriel Mar 21, 2023
b2bf829
Merge branch 'main' into remove-JUMP_IF_FALSE_OR_POP
iritkatriel Mar 22, 2023
ddb3003
make remove_redundant_nops_and_pairs safe
iritkatriel Mar 22, 2023
ab2dfe1
Merge remote-tracking branch 'upstream/main' into remove-JUMP_IF_FALS…
iritkatriel Mar 22, 2023
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
make remove_redundant_nops_and_pairs safe
  • Loading branch information
@iritkatriel
iritkatriel committed Mar 22, 2023
commit ddb30038fa68d6af463be94960c2a1fc827694e6
6 changes: 5 additions & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9326,6 +9326,10 @@ remove_redundant_nops_and_pairs(basicblock *entryblock)
struct cfg_instr *instr = NULL;
for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
remove_redundant_nops(b);
if (IS_LABEL(b->b_label)) {
/* this block is a jump target, forget instr */
instr = NULL;
}
for (int i = 0; i < b->b_iused; i++) {
prev_instr = instr;
instr = &b->b_instr[i];
Expand All @@ -9347,7 +9351,7 @@ remove_redundant_nops_and_pairs(basicblock *entryblock)
done = false;
}
}
if (! BB_HAS_FALLTHROUGH(b)) {
if ((instr && is_jump(instr)) || !BB_HAS_FALLTHROUGH(b)) {
instr = NULL;
}
}
Expand Down