Merge branch 'PHP-8.2'

dstogov · dstogov · commit e335630d8b56 · 2023-01-24T09:32:38.000+03:00
* PHP-8.2: Fix incorrect check condition in type inference (#10425)
diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
@@ -2537,7 +2537,7 @@ static zend_always_inline zend_result _zend_update_type_info(
 					UPDATE_SSA_TYPE(orig, ssa_op->op1_def);
 					COPY_SSA_OBJ_TYPE(ssa_op->op1_use, ssa_op->op1_def);
 				}
-			} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP) {
+			} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP) {
 				/* Nothing to do */
 			} else {
 				if (opline->opcode == ZEND_ASSIGN_OP && ssa_op->result_def >= 0 && (tmp & MAY_BE_RC1)) {

Original file line number	Diff line number	Diff line change
`@@ -2537,7 +2537,7 @@ static zend_always_inline zend_result _zend_update_type_info(`
`2537`	`2537`	`UPDATE_SSA_TYPE(orig, ssa_op->op1_def);`
`2538`	`2538`	`COPY_SSA_OBJ_TYPE(ssa_op->op1_use, ssa_op->op1_def);`
`2539`	`2539`	`}`
`2540`		`- } else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP) {`
	`2540`	`+ } else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP) {`
`2541`	`2541`	`/* Nothing to do */`
`2542`	`2542`	`} else {`
`2543`	`2543`	`if (opline->opcode == ZEND_ASSIGN_OP && ssa_op->result_def >= 0 && (tmp & MAY_BE_RC1)) {`