@@ -2913,16 +2913,16 @@ static int zend_jit_trace_end_loop(dasm_State **Dst, int loop_label, const void
2913
2913
2914
2914
static int zend_jit_check_exception(dasm_State **Dst)
2915
2915
{
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
2918
2918
return 1;
2919
2919
}
2920
2920
2921
2921
static int zend_jit_check_exception_undef_result(dasm_State **Dst, const zend_op *opline)
2922
2922
{
2923
2923
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
2926
2926
return 1;
2927
2927
}
2928
2928
return zend_jit_check_exception(Dst);
@@ -7366,11 +7366,11 @@ static int zend_jit_cmp(dasm_State **Dst,
7366
7366
| FREE_OP opline->op1_type, opline->op1, op1_info, 0, opline, ZREG_TMP1, ZREG_TMP2
7367
7367
}
7368
7368
| 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
- }
7372
7369
| ldr RETVALw, T1 // restore
7373
7370
}
7371
+ if (may_throw) {
7372
+ zend_jit_check_exception_undef_result(Dst, opline);
7373
+ }
7374
7374
if (!zend_jit_cmp_slow(Dst, opline, res_addr, smart_branch_opcode, target_label, target_label2, exit_addr)) {
7375
7375
return 0;
7376
7376
}
0 commit comments