From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 14 Jul 2020 08:52:15 +0000 (+0200)
Subject: Use different scratch register
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c89f23c4552405b4603156c0c81d6cc0bd7f5c3;p=php

Use different scratch register

r1 clashes with FCARG1a on Windows, so use a different scratch
register. FCARG2a should be free here. Hopefully fixes the
AppVeyor build.
---

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index ffc85b1f02..bedd4275a7 100644
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -11624,7 +11624,7 @@ static zend_bool zend_jit_verify_return_type(dasm_State **Dst, const zend_op *op
 	if (op1_info & MAY_BE_UNDEF) {
 		|	IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >8
 		|	mov FCARG1a, opline->op1.var
-		|	EXT_CALL zend_jit_undefined_op_helper, r1
+		|	EXT_CALL zend_jit_undefined_op_helper, FCARG2a
 		|	LOAD_ADDR_ZTS r0, executor_globals, uninitialized_zval
 	}
 	|8: