Skip to content

[pull] master from php:master #748

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
pull merged 3 commits into from
Feb 25, 2026
+21 −8
Merged

[pull] master from php:master #748

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f073425
Update IR
dstogov Feb 25, 2026
908723a
Merge branch 'PHP-8.4' into PHP-8.5
dstogov Feb 25, 2026
031b4c6
Merge branch 'PHP-8.5'
dstogov Feb 25, 2026
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
29 changes: 21 additions & 8 deletions ext/opcache/jit/ir/ir_cfg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,8 +1034,6 @@ static IR_NEVER_INLINE void ir_collect_irreducible_loops(ir_ctx *ctx, uint32_t *
do {
uint32_t pred = *p;
if (ENTRY_TIME(pred) > ENTRY_TIME(hdr) && EXIT_TIME(pred) < EXIT_TIME(hdr)) {
IR_ASSERT(blocks[pred].loop_header == 0);
// blocks[pred].loop_header = 0; /* support for merged loops */
ir_worklist_push(work, pred);
}
p++;
Expand All @@ -1046,7 +1044,9 @@ static IR_NEVER_INLINE void ir_collect_irreducible_loops(ir_ctx *ctx, uint32_t *
uint32_t b = ir_worklist_pop(work);

bb = &blocks[b];
bb->loop_header = hdr;
if (!bb->loop_header) {
bb->loop_header = hdr;
}

uint32_t *p = &edges[bb->predecessors];
uint32_t n = bb->predecessors_count;
Expand Down Expand Up @@ -1175,8 +1175,6 @@ int ir_find_loops(ir_ctx *ctx)
if (!ir_worklist_len(&work)) {
ir_bitset_clear(work.visited, ir_bitset_len(ir_worklist_capasity(&work)));
}
IR_ASSERT(!blocks[pred].loop_header);
// blocks[pred].loop_header = 0; /* support for merged loops */
ir_worklist_push(&work, pred);
} else {
/* Otherwise it's a back-edge of irreducible loop. */
Expand Down Expand Up @@ -1214,8 +1212,9 @@ int ir_find_loops(ir_ctx *ctx)
if (b != hdr) {
ir_block *bb = &blocks[b];

IR_ASSERT(!bb->loop_header);
bb->loop_header = hdr;
if (!bb->loop_header) {
bb->loop_header = hdr;
}

uint32_t *p = &edges[bb->predecessors];
uint32_t n = bb->predecessors_count;
Expand Down Expand Up @@ -1479,6 +1478,19 @@ static void ir_dump_chains(ir_ctx *ctx, ir_chain *chains)
}
}
}

static bool ir_is_merged_loop_back_edge(ir_ctx *ctx, uint32_t hdr, uint32_t b)
{
if (ctx->cfg_blocks[hdr].flags & IR_BB_LOOP_HEADER) {
uint32_t loop_depth = ctx->cfg_blocks[hdr].loop_depth;

while (ctx->cfg_blocks[b].loop_depth > loop_depth) {
b = ctx->cfg_blocks[b].loop_header;
}
return b == hdr;
}
return 0;
}
#endif

static int ir_schedule_blocks_bottom_up(ir_ctx *ctx)
Expand Down Expand Up @@ -1535,7 +1547,8 @@ static int ir_schedule_blocks_bottom_up(ir_ctx *ctx)
}
} else if (b != predecessor && ctx->cfg_blocks[predecessor].loop_header != b) {
/* not a loop back-edge */
IR_ASSERT(b == predecessor || ctx->cfg_blocks[predecessor].loop_header == b);
IR_ASSERT(b == predecessor || ctx->cfg_blocks[predecessor].loop_header == b ||
ir_is_merged_loop_back_edge(ctx, b, predecessor));
}
}
}
Expand Down