Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit d0715aa77993 · 2021-09-28T15:22:40.000+03:00
* PHP-8.0:
  JIT: Fixed label mess
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -5714,14 +5714,14 @@ static int zend_jit_assign_to_variable(dasm_State    **Dst,
 			var_addr = var_use_addr = ZEND_ADDR_MEM_ZVAL(ref_reg, 0);
 		}
 		|	// if (Z_ISREF_P(variable_ptr)) {
-		|	IF_NOT_Z_TYPE Rx(ref_reg), IS_REFERENCE, >1, TMP1w
+		|	IF_NOT_Z_TYPE Rx(ref_reg), IS_REFERENCE, >3, TMP1w
 		|	// if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(variable_ptr)))) {
 		|	GET_Z_PTR FCARG1x, Rx(ref_reg)
 		if (!zend_jit_assign_to_typed_ref(Dst, opline, val_type, val_addr, res_addr, check_exception)) {
 			return 0;
 		}
 		|	add Rx(ref_reg), FCARG1x, #offsetof(zend_reference, val)
-		|1:
+		|3:
 	}
 	if (var_info & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) {
 		if (RC_MAY_BE_1(var_info)) {
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -6200,14 +6200,14 @@ static int zend_jit_assign_to_variable(dasm_State    **Dst,
 			var_addr = var_use_addr = ZEND_ADDR_MEM_ZVAL(ref_reg, 0);
 		}
 		|	// if (Z_ISREF_P(variable_ptr)) {
-		|	IF_NOT_Z_TYPE, Ra(ref_reg), IS_REFERENCE, >1
+		|	IF_NOT_Z_TYPE, Ra(ref_reg), IS_REFERENCE, >3
 		|	// if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(variable_ptr)))) {
 		|	GET_Z_PTR FCARG1a, Ra(ref_reg)
 		if (!zend_jit_assign_to_typed_ref(Dst, opline, val_type, val_addr, res_addr, check_exception)) {
 			return 0;
 		}
 		|	lea Ra(ref_reg), [FCARG1a + offsetof(zend_reference, val)]
-		|1:
+		|3:
 	}
 	if (var_info & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) {
 		if (RC_MAY_BE_1(var_info)) {

Original file line number	Diff line number	Diff line change
`@@ -5714,14 +5714,14 @@ static int zend_jit_assign_to_variable(dasm_State **Dst,`
`5714`	`5714`	`var_addr = var_use_addr = ZEND_ADDR_MEM_ZVAL(ref_reg, 0);`
`5715`	`5715`	`}`
`5716`	`5716`	`\| // if (Z_ISREF_P(variable_ptr)) {`
`5717`		`- \| IF_NOT_Z_TYPE Rx(ref_reg), IS_REFERENCE, >1, TMP1w`
	`5717`	`+ \| IF_NOT_Z_TYPE Rx(ref_reg), IS_REFERENCE, >3, TMP1w`
`5718`	`5718`	`\| // if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(variable_ptr)))) {`
`5719`	`5719`	`\| GET_Z_PTR FCARG1x, Rx(ref_reg)`
`5720`	`5720`	`if (!zend_jit_assign_to_typed_ref(Dst, opline, val_type, val_addr, res_addr, check_exception)) {`
`5721`	`5721`	`return 0;`
`5722`	`5722`	`}`
`5723`	`5723`	`\| add Rx(ref_reg), FCARG1x, #offsetof(zend_reference, val)`
`5724`		`- \|1:`
	`5724`	`+ \|3:`
`5725`	`5725`	`}`
`5726`	`5726`	`if (var_info & (MAY_BE_STRING\|MAY_BE_ARRAY\|MAY_BE_OBJECT\|MAY_BE_RESOURCE)) {`
`5727`	`5727`	`if (RC_MAY_BE_1(var_info)) {`
Original file line number	Diff line number	Diff line change
`@@ -6200,14 +6200,14 @@ static int zend_jit_assign_to_variable(dasm_State **Dst,`
`6200`	`6200`	`var_addr = var_use_addr = ZEND_ADDR_MEM_ZVAL(ref_reg, 0);`
`6201`	`6201`	`}`
`6202`	`6202`	`\| // if (Z_ISREF_P(variable_ptr)) {`
`6203`		`- \| IF_NOT_Z_TYPE, Ra(ref_reg), IS_REFERENCE, >1`
	`6203`	`+ \| IF_NOT_Z_TYPE, Ra(ref_reg), IS_REFERENCE, >3`
`6204`	`6204`	`\| // if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(variable_ptr)))) {`
`6205`	`6205`	`\| GET_Z_PTR FCARG1a, Ra(ref_reg)`
`6206`	`6206`	`if (!zend_jit_assign_to_typed_ref(Dst, opline, val_type, val_addr, res_addr, check_exception)) {`
`6207`	`6207`	`return 0;`
`6208`	`6208`	`}`
`6209`	`6209`	`\| lea Ra(ref_reg), [FCARG1a + offsetof(zend_reference, val)]`
`6210`		`- \|1:`
	`6210`	`+ \|3:`
`6211`	`6211`	`}`
`6212`	`6212`	`if (var_info & (MAY_BE_STRING\|MAY_BE_ARRAY\|MAY_BE_OBJECT\|MAY_BE_RESOURCE)) {`
`6213`	`6213`	`if (RC_MAY_BE_1(var_info)) {`