From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 29 Oct 2019 08:57:29 +0000 (+0100)
Subject: Try to fix asan warning in scalar_constant_defaults.phpt
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39897eb80b7a97fc7e6c730a9e07a336eac2bfb8;p=php

Try to fix asan warning in scalar_constant_defaults.phpt

Doing the SAVE_VALID_OPLINE right before the call, because we
still need r0 before that.
---

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index 7422aab592..003ddd3072 100644
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -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