Skip to content

[block_pass] Relink successors after block becomes empty #20909

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

Open
iluuu1994 wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

[block_pass] Relink successors after block becomes empty #20909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion Zend/Optimizer/block_pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
}
}
break;

case ZEND_BOOL:
case ZEND_BOOL_NOT:
optimize_bool:
Expand Down Expand Up @@ -1800,6 +1800,7 @@ void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
}

/* Eliminate NOPs */
bool recompute_successors = false;
for (b = blocks; b < end; b++) {
if (b->flags & ZEND_BB_UNREACHABLE_FREE) {
/* In unreachable_free blocks only preserve loop var frees. */
Expand All @@ -1813,6 +1814,19 @@ void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
if (b->flags & (ZEND_BB_REACHABLE|ZEND_BB_UNREACHABLE_FREE)) {
strip_nops(op_array, b);
}
if (b->len == 0 && (b->flags & ZEND_BB_TARGET)) {
recompute_successors = true;
}
}
if (recompute_successors) {
for (b = blocks; b < end; b++) {
for (int s = 0; s < b->successors_count; s++) {
get_target_block(&cfg, b, s, &opt_count);
}
if (b->len == 0 && (b->flags & ZEND_BB_TARGET)) {
b->flags &= ~ZEND_BB_TARGET;
}
}
}

opt_count = 0;
Expand Down
Loading