From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 21 Jul 2020 09:21:47 +0000 (+0300)
Subject: Use different temporary register
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb9e3dd6cc26da51a9ef55cdb18baf90f5ba2bda;p=php

Use different temporary register
---

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
 		}
 	}