From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3NIJzXggKCgEhqspdjebhpphmf.dpnmjcbcjhbjmtpvsdfxbsf.psh@flex--gprocida.bounces.google.com> Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by sourceware.org (Postfix) with ESMTPS id 3ADAD385E830 for ; Thu, 19 Mar 2020 14:31:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3ADAD385E830 Received: by mail-wr1-x449.google.com with SMTP id c6so1076813wrm.18 for ; Thu, 19 Mar 2020 07:31:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=1cIbV5A/IDZp+QCjOOTHDDg8XmIkZR7qK/URWbTHUz8=; b=r/am7INl7wc4ieX+MfqX+5zRdUrt2ke/Puzq9tuWxqlAnxH/Al4qy9JshLineczmBn wFLaSMRcE/GjoVOk0WQ9lpLVVuW8WYQN8Kdc+wM8wWVnJtJcc+0J6vVmAKaU0ODj7zgw ZDke04O+zjpt495IOqmsqY3DCxr8LF4McF900bUZQacVVFZE0oila+rXntaLg2fXEFXr bUqamfdxECcifsLZfDrYcFXazXgjiKnTU8GDETic7mRrArkiG90f+vqpeEYCyCLcP4DJ OiWZt2MPy7qOik7GdQYrHyDO0AFJRT93uxuAeCZGcEqOMTusIvJOVmBJu0TmWhIOomA/ /xhA== X-Gm-Message-State: ANhLgQ0xWYaYgfgNwPj/XF7+/u+uIrkoKfDngeH75oJQOpyizDPjMMSh +gB1xZAZG+zatUVFZeBYaT8AYv9i0WbCG19CUdUlYP985qm1z57ySj11M3jFq9yJcAj9txPRdvr ZeMb7or78Bk9DokOzBuOaC5QIpI8ZduB7j4C5pvkUhATEva1+yGL4h1I2FIAYSzyt7q2NnUA= X-Google-Smtp-Source: ADFU+vu+hk9mZ5wJOfhdvqoQM4MmYu5OLP9MRHLoeu+4gvyzFdQuI2JO8D92RhC9ouiH7jyEfsAmltbDcSDUPA== X-Received: by 2002:a5d:5444:: with SMTP id w4mr4500174wrv.387.1584628276071; Thu, 19 Mar 2020 07:31:16 -0700 (PDT) Date: Thu, 19 Mar 2020 14:31:07 +0000 In-Reply-To: Message-Id: <20200319143107.254188-1-gprocida@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog Subject: [PATCH v2] abg-ir.cc: Remove always-true check. From: Giuliano Procida To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com, Matthias Maennich Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-32.7 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libabigail mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2020 14:31:18 -0000 There is an instance of a if-statement testing the same variable as its containing if-statement. The inner test always evaluates to true, if it is reached. * src/abg-ir.cc (types_have_similar_structure): Remove identical nested conditional. (reference_type_def::reference_type_def): Tabify. Reviewed-by: Matthias Maennich Signed-off-by: Giuliano Procida --- src/abg-ir.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 13023295..e84114cc 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -13573,10 +13573,10 @@ reference_type_def::reference_type_def(const type_base_sptr pointed_to, decl_base_sptr pto = dynamic_pointer_cast(pointed_to); string name; if (pto) - { - set_visibility(pto->get_visibility()); - name = string(pto->get_name()) + "&"; - } + { + set_visibility(pto->get_visibility()); + name = string(pto->get_name()) + "&"; + } else name = string(get_type_name(is_function_type(pointed_to), /*qualified_name=*/true)) + "&"; @@ -22669,11 +22669,10 @@ types_have_similar_structure(const type_base* first, const type_base* second) if (!was_indirect_type) { - if (!was_indirect_type) - if ((ty1->get_size_in_bits() != ty2->get_size_in_bits()) - || (ty1->get_non_static_data_members().size() - != ty2->get_non_static_data_members().size())) - return false; + if ((ty1->get_size_in_bits() != ty2->get_size_in_bits()) + || (ty1->get_non_static_data_members().size() + != ty2->get_non_static_data_members().size())) + return false; for (class_or_union::data_members::const_iterator i = ty1->get_non_static_data_members().begin(), -- 2.25.1.481.gfbce0eb801-goog