Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 2a33280ceb97 · 2022-08-22T19:55:10.000+03:00
* PHP-8.0:
  JIT: Make code generation to be consistent with register allocation
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -8233,7 +8233,7 @@ static int zend_jit_bool_jmpznz(dasm_State **Dst, const zend_op *opline, uint32_
 		}
 	}
 
-	if ((op1_info & MAY_BE_ANY) == MAY_BE_DOUBLE) {
+	if ((op1_info & (MAY_BE_ANY-(MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG))) == MAY_BE_DOUBLE) {
 	    |2:
 		|	fmov FPR0, xzr  // TODO: "movi d0, #0" is not recognized by DynASM/arm64
 		|	DOUBLE_CMP ZREG_FPR0, op1_addr, ZREG_TMP1, ZREG_FPTMP
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -8820,7 +8820,7 @@ static int zend_jit_bool_jmpznz(dasm_State **Dst, const zend_op *opline, uint32_
 		}
 	}
 
-	if ((op1_info & MAY_BE_ANY) == MAY_BE_DOUBLE) {
+	if ((op1_info & (MAY_BE_ANY-(MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG))) == MAY_BE_DOUBLE) {
 		|2:
 		if (CAN_USE_AVX()) {
 			|	vxorps xmm0, xmm0, xmm0

Original file line number	Diff line number	Diff line change
`@@ -8233,7 +8233,7 @@ static int zend_jit_bool_jmpznz(dasm_State *Dst, const zend_op opline, uint32_`
`8233`	`8233`	`}`
`8234`	`8234`	`}`
`8235`	`8235`
`8236`		`- if ((op1_info & MAY_BE_ANY) == MAY_BE_DOUBLE) {`
	`8236`	`+ if ((op1_info & (MAY_BE_ANY-(MAY_BE_NULL\|MAY_BE_FALSE\|MAY_BE_TRUE\|MAY_BE_LONG))) == MAY_BE_DOUBLE) {`
`8237`	`8237`	`\|2:`
`8238`	`8238`	`\| fmov FPR0, xzr // TODO: "movi d0, #0" is not recognized by DynASM/arm64`
`8239`	`8239`	`\| DOUBLE_CMP ZREG_FPR0, op1_addr, ZREG_TMP1, ZREG_FPTMP`
Original file line number	Diff line number	Diff line change
`@@ -8820,7 +8820,7 @@ static int zend_jit_bool_jmpznz(dasm_State *Dst, const zend_op opline, uint32_`
`8820`	`8820`	`}`
`8821`	`8821`	`}`
`8822`	`8822`
`8823`		`- if ((op1_info & MAY_BE_ANY) == MAY_BE_DOUBLE) {`
	`8823`	`+ if ((op1_info & (MAY_BE_ANY-(MAY_BE_NULL\|MAY_BE_FALSE\|MAY_BE_TRUE\|MAY_BE_LONG))) == MAY_BE_DOUBLE) {`
`8824`	`8824`	`\|2:`
`8825`	`8825`	`if (CAN_USE_AVX()) {`
`8826`	`8826`	`\| vxorps xmm0, xmm0, xmm0`