Skip to content

gh-93678: apply remove_redundant_jumps in optimize_cfg #96274

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 8 commits into from
Sep 1, 2022
Merged

gh-93678: apply remove_redundant_jumps in optimize_cfg #96274

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79a0268
gh-93678: apply remove_redundant_jumps in optimize_cfg
iritkatriel Aug 25, 2022
d249b04
Merge remote-tracking branch 'upstream/main' into optimize_stage
iritkatriel Aug 30, 2022
d0ffa15
assert_no_redundant_jumps --> no_redundant_jumps
iritkatriel Aug 30, 2022
e47688a
ASSERT_NO_REDUNDANT_JUMPS macro
iritkatriel Aug 30, 2022
6803fb5
Revert "ASSERT_NO_REDUNDANT_JUMPS macro"
iritkatriel Aug 31, 2022
566d9c0
Py_DEBUG --> NDEBUG
iritkatriel Aug 31, 2022
9c06493
ifdef --> ifndef
iritkatriel Aug 31, 2022
065d97d
Merge branch 'main' into optimize_stage
iritkatriel Aug 31, 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
ASSERT_NO_REDUNDANT_JUMPS macro
  • Loading branch information
@iritkatriel
iritkatriel committed Aug 30, 2022
commit e47688ae7b83d174708051f96496a1154ff476e1
7 changes: 6 additions & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8496,8 +8496,13 @@ no_redundant_jumps(cfg_builder *g) {
}
return true;
}

#define ASSERT_NO_REDUNDANT_JUMPS(G) assert(no_redundant_jumps(G))
#else
#define ASSERT_NO_REDUNDANT_JUMPS(G)
#endif


static int
remove_redundant_jumps(cfg_builder *g) {
/* If a non-empty block ends with a jump instruction, check if the next
Expand Down Expand Up @@ -8644,7 +8649,7 @@ assemble(struct compiler *c, int addNone)
goto error;
}

assert(no_redundant_jumps(g));
ASSERT_NO_REDUNDANT_JUMPS(g);

/* Can't modify the bytecode after computing jump offsets. */
assemble_jump_offsets(g->g_entryblock);
Expand Down