Merge branch 'PHP-8.1'

dstogov · dstogov · commit d8c654997425 · 2022-08-22T20:00:44.000+03:00
* PHP-8.1:
  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
@@ -8131,7 +8131,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
@@ -8736,7 +8736,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
`@@ -8131,7 +8131,7 @@ static int zend_jit_bool_jmpznz(dasm_State *Dst, const zend_op opline, uint32_`
`8131`	`8131`	`}`
`8132`	`8132`	`}`
`8133`	`8133`
`8134`		`- if ((op1_info & MAY_BE_ANY) == MAY_BE_DOUBLE) {`
	`8134`	`+ if ((op1_info & (MAY_BE_ANY-(MAY_BE_NULL\|MAY_BE_FALSE\|MAY_BE_TRUE\|MAY_BE_LONG))) == MAY_BE_DOUBLE) {`
`8135`	`8135`	`\|2:`
`8136`	`8136`	`\| fmov FPR0, xzr // TODO: "movi d0, #0" is not recognized by DynASM/arm64`
`8137`	`8137`	`\| DOUBLE_CMP ZREG_FPR0, op1_addr, ZREG_TMP1, ZREG_FPTMP`
Original file line number	Diff line number	Diff line change
`@@ -8736,7 +8736,7 @@ static int zend_jit_bool_jmpznz(dasm_State *Dst, const zend_op opline, uint32_`
`8736`	`8736`	`}`
`8737`	`8737`	`}`
`8738`	`8738`
`8739`		`- if ((op1_info & MAY_BE_ANY) == MAY_BE_DOUBLE) {`
	`8739`	`+ if ((op1_info & (MAY_BE_ANY-(MAY_BE_NULL\|MAY_BE_FALSE\|MAY_BE_TRUE\|MAY_BE_LONG))) == MAY_BE_DOUBLE) {`
`8740`	`8740`	`\|2:`
`8741`	`8741`	`if (CAN_USE_AVX()) {`
`8742`	`8742`	`\| vxorps xmm0, xmm0, xmm0`