Merge branch 'PHP-8.1'

dstogov · dstogov · commit de7e23ab62bb · 2022-02-28T13:56:01.000+03:00
* PHP-8.1:
  Allow setting full type info
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -3555,7 +3555,7 @@ static int zend_jit_store_var(dasm_State **Dst, uint32_t info, int var, zend_reg
 	return zend_jit_spill_store(Dst, src, dst, info, set_type);
 }
 
-static int zend_jit_store_var_type(dasm_State **Dst, int var, uint8_t type)
+static int zend_jit_store_var_type(dasm_State **Dst, int var, uint32_t type)
 {
 	zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, EX_NUM_TO_VAR(var));
 
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -3895,7 +3895,7 @@ static int zend_jit_store_var(dasm_State **Dst, uint32_t info, int var, zend_reg
 	return zend_jit_spill_store(Dst, src, dst, info, set_type);
 }
 
-static int zend_jit_store_var_type(dasm_State **Dst, int var, uint8_t type)
+static int zend_jit_store_var_type(dasm_State **Dst, int var, uint32_t type)
 {
 	zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, EX_NUM_TO_VAR(var));
 

Original file line number	Diff line number	Diff line change
`@@ -3555,7 +3555,7 @@ static int zend_jit_store_var(dasm_State **Dst, uint32_t info, int var, zend_reg`
`3555`	`3555`	`return zend_jit_spill_store(Dst, src, dst, info, set_type);`
`3556`	`3556`	`}`
`3557`	`3557`
`3558`		`-static int zend_jit_store_var_type(dasm_State **Dst, int var, uint8_t type)`
	`3558`	`+static int zend_jit_store_var_type(dasm_State **Dst, int var, uint32_t type)`
`3559`	`3559`	`{`
`3560`	`3560`	`zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, EX_NUM_TO_VAR(var));`
`3561`	`3561`
Original file line number	Diff line number	Diff line change
`@@ -3895,7 +3895,7 @@ static int zend_jit_store_var(dasm_State **Dst, uint32_t info, int var, zend_reg`
`3895`	`3895`	`return zend_jit_spill_store(Dst, src, dst, info, set_type);`
`3896`	`3896`	`}`
`3897`	`3897`
`3898`		`-static int zend_jit_store_var_type(dasm_State **Dst, int var, uint8_t type)`
	`3898`	`+static int zend_jit_store_var_type(dasm_State **Dst, int var, uint32_t type)`
`3899`	`3899`	`{`
`3900`	`3900`	`zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, EX_NUM_TO_VAR(var));`
`3901`	`3901`