Skip to content

[pull] master from php:master #650

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 2 commits into from
Mar 7, 2025
Merged

[pull] master from php:master #650

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5885b94
Fix function JIT for Wordpress unit tests
dstogov Mar 6, 2025
cd58662
Merge branch 'PHP-8.4'
dstogov Mar 6, 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
5 changes: 5 additions & 0 deletions ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3562,6 +3562,8 @@ static void jit_IF_TRUE_FALSE_ex(zend_jit_ctx *jit, ir_ref if_ref, ir_ref true_b
}
}

static void zend_jit_case_start(zend_jit_ctx *jit, int switch_b, int case_b, ir_ref switch_ref);

static void _zend_jit_add_predecessor_ref(zend_jit_ctx *jit, int b, int pred, ir_ref ref)
{
int i, *p;
Expand All @@ -3584,6 +3586,9 @@ static void _zend_jit_add_predecessor_ref(zend_jit_ctx *jit, int b, int pred, ir
} else if (jit->ctx.ir_base[ref].op == IR_IF) {
jit_IF_TRUE_FALSE_ex(jit, ref, b);
ref = ir_LOOP_END();
} else if (jit->ctx.ir_base[ref].op == IR_SWITCH) {
zend_jit_case_start(jit, pred, b, ref);
ref = ir_LOOP_END();
} else if (jit->ctx.ir_base[ref].op == IR_UNREACHABLE) {
ir_BEGIN(ref);
ref = ir_LOOP_END();
Expand Down
Loading