]> granicus.if.org Git - php/commitdiff
Use different scratch register
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 14 Jul 2020 08:52:15 +0000 (10:52 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 14 Jul 2020 08:52:50 +0000 (10:52 +0200)
r1 clashes with FCARG1a on Windows, so use a different scratch
register. FCARG2a should be free here. Hopefully fixes the
AppVeyor build.

ext/opcache/jit/zend_jit_x86.dasc

index ffc85b1f023e3a252d16e1ddcb6a1b72c32a8d63..bedd4275a7ddf3a3d10d87d6ee9c22562b0ab5b8 100644 (file)
@@ -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: