From: Nikita Popov Date: Tue, 10 Dec 2019 08:03:44 +0000 (+0100) Subject: Fix merge mistake X-Git-Tag: php-7.4.7RC1~449 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4313659bb932737c31e0bfffa2410c501df2a2ff;p=php Fix merge mistake --- diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h index cec021bd9b..0dbbf40efd 100644 --- 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;