Skip to content

Zend/Optimizer: Various minor refactoring (part 3) #20046

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
merged 11 commits into from
Oct 4, 2025
Merged

Zend/Optimizer: Various minor refactoring (part 3) #20046

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d848e41
Zend/Optimizer: change copy parameter type from int to bool in zend_o…
Girgias Oct 3, 2025
8f5619e
Zend/Optimizer/block_pass.c: add const qualifiers
Girgias Oct 3, 2025
5cd4b31
Zend/Optimizer/block_pass.c: change return type of get_const_switch_t…
Girgias Oct 3, 2025
694bccf
Zend/Optimizer/block_pass.c: remove useless variable declaration and …
Girgias Oct 3, 2025
d9260af
Zend/Optimizer/block_pass.c: prevent variable shadowing
Girgias Oct 3, 2025
0468af7
Zend/Optimizer/dce.c: add const qualifiers
Girgias Oct 3, 2025
171655f
Zend/Optimizer/zend_ssa: add const qualifiers
Girgias Oct 3, 2025
38fc6a2
Zend/Optimizer/zend_dfg: add const qualifiers
Girgias Oct 3, 2025
d07cfd3
Zend/Optimizer/zend_dfg: use uint32_t type instead of int
Girgias Oct 3, 2025
baf50c8
Zend/Optimizer/zend_dfg.c: rename function
Girgias Oct 3, 2025
4390527
Zend/Optimizer/zend_inference: add const qualifiers
Girgias Oct 3, 2025
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
20 changes: 10 additions & 10 deletions Zend/Optimizer/block_pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,8 +1042,8 @@ static void assemble_code_blocks(const zend_cfg *cfg, zend_op_array *op_array, z
} else {
/* this block will not be used, delete all constants there */
const zend_op *op = op_array->opcodes + b->start;
const zend_op *end = op + b->len;
for (; op < end; op++) {
const zend_op *last_op = op + b->len;
for (; op < last_op; op++) {
if (op->op1_type == IS_CONST) {
literal_dtor(&ZEND_OP1_LITERAL(op));
}
Expand Down Expand Up @@ -1159,15 +1159,15 @@ static void assemble_code_blocks(const zend_cfg *cfg, zend_op_array *op_array, z
}

if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
zend_op *opline = new_opcodes;
const zend_op *end = opline + len;
while (opline < end) {
if (opline->opcode == ZEND_FAST_RET &&
opline->op2.num != (uint32_t)-1 &&
opline->op2.num < j) {
opline->op2.num = map[opline->op2.num];
zend_op *finally_opline = new_opcodes;
const zend_op *last_finally_op = finally_opline + len;
while (finally_opline < last_finally_op) {
Comment on lines +1163 to +1164
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This is not the last finally op, it's the op after it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, but isn't it a usual convention that "last" means +1? Or am I confused?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'm not blocking this change. There are some cases of last being used to mean +1, especially in op_array, but I find it confusing. end is slightly better.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do also find it confusing, just couldn't think of a name :) Might keep it like this for the time being tho

if (finally_opline->opcode == ZEND_FAST_RET &&
finally_opline->op2.num != (uint32_t)-1 &&
finally_opline->op2.num < j) {
finally_opline->op2.num = map[finally_opline->op2.num];
}
opline++;
finally_opline++;
}
}
}
Expand Down