php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update IR

Browse Source 
IR commit: 709ccf854ec708c36c0dd2a77996554f13e722f3

Fixes failures in function JIT introduced in d2b54dc
This commit is contained in:
Dmitry Stogov
2024-04-04 10:09:51 +03:00
parent d2b54dc53e
commit 0bf574afa3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ext/opcache/jit/ir/ir_cfg.c
View File

@@ -1545,7 +1545,6 @@ int ir_build_dominators_tree(ir_ctx *ctx)
/* In rare cases, LOOP_BEGIN.op1 may be a back-edge. Skip back-edges. */
ctx->flags2 &= ~IR_NO_LOOPS;
IR_ASSERT(k > 1);
IR_ASSERT(blocks[idom].successors_count == 1);
ir_list_push(&worklist, idom);
while (1) {
k--;
@@ -1555,7 +1554,6 @@ int ir_build_dominators_tree(ir_ctx *ctx)
break;
}
IR_ASSERT(k > 0);
IR_ASSERT(blocks[idom].successors_count == 1);
ir_list_push(&worklist, idom);
}
}
@@ -1578,7 +1576,6 @@ int ir_build_dominators_tree(ir_ctx *ctx)
} else {
ctx->flags2 &= ~IR_NO_LOOPS;
IR_ASSERT(bb->predecessors_count > 1);
IR_ASSERT(blocks[pred_b].successors_count == 1);
ir_list_push(&worklist, pred_b);
}
}
@@ -1616,8 +1613,16 @@ int ir_build_dominators_tree(ir_ctx *ctx)
do {
b = ir_list_pop(&worklist);
bb = &blocks[b];
IR_ASSERT(bb->successors_count == 1);
succ_b = ctx->cfg_edges[bb->successors];
if (bb->successors_count != 1) {
/* LOOP_END/END may be linked with the following ENTRY by a fake edge */
IR_ASSERT(bb->successors_count == 2);
if (blocks[succ_b].flags & IR_BB_ENTRY) {
succ_b = ctx->cfg_edges[bb->successors + 1];
} else {
IR_ASSERT(blocks[ctx->cfg_edges[bb->successors + 1]].flags & IR_BB_ENTRY);
}
}
dom_depth = blocks[succ_b].dom_depth;;
while (bb->dom_depth > dom_depth) {
b = bb->dom_parent;