Fix merge mistake

nikic · nikic · commit 4313659bb932 · 2019-12-10T09:03:44.000+01:00
diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h
@@ -224,8 +224,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
`@@ -224,8 +224,6 @@ static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op *opline`
`224`	`224`	`if (ssa_op->result_use == var`
`225`	`225`	`&& opline->opcode != ZEND_ADD_ARRAY_ELEMENT`
`226`	`226`	`&& opline->opcode != ZEND_ADD_ARRAY_UNPACK) {`
`227`		`- }`
`228`		`- if (ssa_op->result_use == var && opline->opcode != ZEND_ADD_ARRAY_ELEMENT) {`
`229`	`227`	`return ssa_op->op1_use != var && ssa_op->op2_use != var;`
`230`	`228`	`}`
`231`	`229`	`return 0;`