Merge branch 'PHP-7.4'

nikic · nikic · commit ea4bb588893c · 2019-12-10T09:04:01.000+01:00
* PHP-7.4:
  Fix merge mistake
diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h
@@ -222,8 +222,6 @@ static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op *opline
 	if (ssa_op->result_use == var
 			&& opline->opcode != ZEND_ADD_ARRAY_ELEMENT
 			&& opline->opcode != ZEND_ADD_ARRAY_UNPACK) {
-	}
-	if (ssa_op->result_use == var && opline->opcode != ZEND_ADD_ARRAY_ELEMENT) {
 		return ssa_op->op1_use != var && ssa_op->op2_use != var;
 	}
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,6 @@ static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op *opline`
`222`	`222`	`if (ssa_op->result_use == var`
`223`	`223`	`&& opline->opcode != ZEND_ADD_ARRAY_ELEMENT`
`224`	`224`	`&& opline->opcode != ZEND_ADD_ARRAY_UNPACK) {`
`225`		`- }`
`226`		`- if (ssa_op->result_use == var && opline->opcode != ZEND_ADD_ARRAY_ELEMENT) {`
`227`	`225`	`return ssa_op->op1_use != var && ssa_op->op2_use != var;`
`228`	`226`	`}`
`229`	`227`	`return 0;`