]> granicus.if.org Git - php/commitdiff
Fix merge mistake
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 10 Dec 2019 08:03:44 +0000 (09:03 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 10 Dec 2019 08:03:44 +0000 (09:03 +0100)
ext/opcache/Optimizer/zend_ssa.h

index cec021bd9b18b035942ade87793f63fe5ce2eae9..0dbbf40efde6cdb24114b6dd1e54bf0a3eb988f0 100644 (file)
@@ -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;