]> granicus.if.org Git - php/commitdiff
Try to fix asan warning in scalar_constant_defaults.phpt
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 29 Oct 2019 08:57:29 +0000 (09:57 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 29 Oct 2019 09:01:35 +0000 (10:01 +0100)
Doing the SAVE_VALID_OPLINE right before the call, because we
still need r0 before that.

ext/opcache/jit/zend_jit_x86.dasc

index 7422aab592da7eadf3cce514f98424ac1ec6ac65..003ddd3072fd072cdd0623bd2b027eb17442e747 100644 (file)
@@ -9228,17 +9228,20 @@ static int zend_jit_recv_init(dasm_State **Dst, const zend_op *opline, const zen
                                |       mov CARG3, arg_num
                                |       LOAD_ADDR CARG4, (ptrdiff_t)arg_info
                                |       mov aword A5, r0
+                               |       SAVE_VALID_OPLINE opline
                                |       EXT_CALL zend_jit_verify_arg_object, r0
                        |.elif X64
                                |       mov CARG3, arg_num
                                |       LOAD_ADDR CARG4, (ptrdiff_t)arg_info
                                |       mov CARG5, r0
+                               |       SAVE_VALID_OPLINE opline
                                |       EXT_CALL zend_jit_verify_arg_object, r0
                        |.else
                                |       sub r4, 4
                                |       push r0
                                |       push (ptrdiff_t)arg_info
                                |       push arg_num
+                               |       SAVE_VALID_OPLINE opline
                                |       EXT_CALL zend_jit_verify_arg_object, r0
                                |       add r4, 4
                        |.endif
@@ -9279,17 +9282,20 @@ static int zend_jit_recv_init(dasm_State **Dst, const zend_op *opline, const zen
                |       mov CARG3, arg_num
                |       LOAD_ADDR CARG4, (ptrdiff_t)arg_info
                |       mov aword A5, r0
+               |       SAVE_VALID_OPLINE opline
                |       EXT_CALL zend_jit_verify_arg_slow, r0
        |.elif X64
                |       mov CARG3, arg_num
                |       LOAD_ADDR CARG4, (ptrdiff_t)arg_info
                |       mov CARG5, r0
+               |       SAVE_VALID_OPLINE opline
                |       EXT_CALL zend_jit_verify_arg_slow, r0
        |.else
                |       sub r4, 4
                |       push r0
                |       push (ptrdiff_t)arg_info
                |       push arg_num
+               |       SAVE_VALID_OPLINE opline
                |       EXT_CALL zend_jit_verify_arg_slow, r0
                |       add r4, 4
        |.endif