Skip to content

Commit 9b3069f

Browse files
committed
JIT: Fixed test failures introduced in 3d35ac0
ext/date/tests/DateTimeZone_compare_basic1.phpt ext/intl/tests/timezone_equals_error.phpt
1 parent 3d35ac0 commit 9b3069f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2913,16 +2913,16 @@ static int zend_jit_trace_end_loop(dasm_State **Dst, int loop_label, const void
29132913

29142914
static int zend_jit_check_exception(dasm_State **Dst)
29152915
{
2916-
| MEM_LOAD_64_ZTS ldr, REG0, executor_globals, exception, TMP1
2917-
| cbnz REG0, ->exception_handler
2916+
| MEM_LOAD_64_ZTS ldr, TMP2, executor_globals, exception, TMP1
2917+
| cbnz TMP2, ->exception_handler
29182918
return 1;
29192919
}
29202920

29212921
static int zend_jit_check_exception_undef_result(dasm_State **Dst, const zend_op *opline)
29222922
{
29232923
if (opline->result_type & (IS_TMP_VAR|IS_VAR)) {
2924-
| MEM_LOAD_64_ZTS ldr, REG0, executor_globals, exception, TMP1
2925-
| cbnz REG0, ->exception_handler_undef
2924+
| MEM_LOAD_64_ZTS ldr, TMP2, executor_globals, exception, TMP1
2925+
| cbnz TMP2, ->exception_handler_undef
29262926
return 1;
29272927
}
29282928
return zend_jit_check_exception(Dst);
@@ -7366,11 +7366,11 @@ static int zend_jit_cmp(dasm_State **Dst,
73667366
| FREE_OP opline->op1_type, opline->op1, op1_info, 0, opline, ZREG_TMP1, ZREG_TMP2
73677367
}
73687368
| FREE_OP opline->op2_type, opline->op2, op2_info, 0, opline, ZREG_TMP1, ZREG_TMP2
7369-
if (may_throw) {
7370-
zend_jit_check_exception_undef_result(Dst, opline);
7371-
}
73727369
| ldr RETVALw, T1 // restore
73737370
}
7371+
if (may_throw) {
7372+
zend_jit_check_exception_undef_result(Dst, opline);
7373+
}
73747374
if (!zend_jit_cmp_slow(Dst, opline, res_addr, smart_branch_opcode, target_label, target_label2, exit_addr)) {
73757375
return 0;
73767376
}

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7901,11 +7901,11 @@ static int zend_jit_cmp(dasm_State **Dst,
79017901
| FREE_OP opline->op1_type, opline->op1, op1_info, 0, opline
79027902
}
79037903
| FREE_OP opline->op2_type, opline->op2, op2_info, 0, opline
7904-
if (may_throw) {
7905-
zend_jit_check_exception_undef_result(Dst, opline);
7906-
}
79077904
| mov eax, dword T1 // restore
79087905
}
7906+
if (may_throw) {
7907+
zend_jit_check_exception_undef_result(Dst, opline);
7908+
}
79097909
if (!zend_jit_cmp_slow(Dst, opline, res_addr, smart_branch_opcode, target_label, target_label2, exit_addr)) {
79107910
return 0;
79117911
}

0 commit comments

Comments
 (0)