From bb9e3dd6cc26da51a9ef55cdb18baf90f5ba2bda Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 21 Jul 2020 12:21:47 +0300 Subject: [PATCH] Use different temporary register --- ext/opcache/jit/zend_jit_x86.dasc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 603fab31cc..8e8ec5694a 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -3226,7 +3226,8 @@ static int zend_jit_trace_handler(dasm_State **Dst, const zend_op_array *op_arra } | EXT_CALL handler, r0 if (may_throw) { - zend_jit_check_exception(Dst); + | MEM_OP2_1_ZTS cmp, aword, executor_globals, exception, 0, r1 + | jne ->exception_handler } while (trace->op != ZEND_JIT_TRACE_VM && trace->op != ZEND_JIT_TRACE_END) { @@ -3241,7 +3242,7 @@ static int zend_jit_trace_handler(dasm_State **Dst, const zend_op_array *op_arra opline->opcode == ZEND_DO_FCALL_BY_NAME || opline->opcode == ZEND_DO_FCALL || opline->opcode == ZEND_GENERATOR_CREATE) { - | MEM_OP2_2_ZTS mov, FP, aword, executor_globals, current_execute_data, r0 + | MEM_OP2_2_ZTS mov, FP, aword, executor_globals, current_execute_data, r1 } } -- 2.50.1