Initialize CV variables through FP (this enables some folding optimizatios)

dstogov · dstogov · commit edb4ee090f24 · 2023-09-08T18:29:20.000+03:00
diff --git a/ext/opcache/jit/ir b/ext/opcache/jit/ir
@@ -1 +1 @@
-Subproject commit d67c212916a633c8d4e54ac21abe466137bfd26a
+Subproject commit ce2d6ceba62a368dc83c74ce3f68aa7cd547d82d
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -9522,9 +9522,9 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
 
 			for (i = call_num_args; i < func->op_array.last_var; i++) {
 				uint32_t n = EX_NUM_TO_VAR(i);
-				zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, n);
+				zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, n);
 
-				jit_set_Z_TYPE_INFO(jit, var_addr, IS_UNDEF);
+				jit_set_Z_TYPE_INFO_ex(jit, var_addr, ir_CONST_U32(IS_UNDEF));
 			}
 
 			if (call_num_args <= func->op_array.num_args) {

Original file line number	Diff line number	Diff line change
`@@ -9522,9 +9522,9 @@ static int zend_jit_do_fcall(zend_jit_ctx jit, const zend_op opline, const zen`
`9522`	`9522`
`9523`	`9523`	`for (i = call_num_args; i < func->op_array.last_var; i++) {`
`9524`	`9524`	`uint32_t n = EX_NUM_TO_VAR(i);`
`9525`		`- zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, n);`
	`9525`	`+ zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, n);`
`9526`	`9526`
`9527`		`- jit_set_Z_TYPE_INFO(jit, var_addr, IS_UNDEF);`
	`9527`	`+ jit_set_Z_TYPE_INFO_ex(jit, var_addr, ir_CONST_U32(IS_UNDEF));`
`9528`	`9528`	`}`
`9529`	`9529`
`9530`	`9530`	`if (call_num_args <= func->op_array.num_args) {`