Use different scratch register

nikic · nikic · commit 8c89f23c4552 · 2020-07-14T10:52:50.000+02:00
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
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -11624,7 +11624,7 @@ static zend_bool zend_jit_verify_return_type(dasm_State *Dst, const zend_op op`
`11624`	`11624`	`if (op1_info & MAY_BE_UNDEF) {`
`11625`	`11625`	`\| IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >8`
`11626`	`11626`	`\| mov FCARG1a, opline->op1.var`
`11627`		`- \| EXT_CALL zend_jit_undefined_op_helper, r1`
	`11627`	`+ \| EXT_CALL zend_jit_undefined_op_helper, FCARG2a`
`11628`	`11628`	`\| LOAD_ADDR_ZTS r0, executor_globals, uninitialized_zval`
`11629`	`11629`	`}`
`11630`	`11630`	`\|8:`