From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb43.google.com (mail-yb1-xb43.google.com [IPv6:2607:f8b0:4864:20::b43]) by sourceware.org (Postfix) with ESMTPS id AB8EC385E828 for ; Thu, 19 Mar 2020 14:18:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AB8EC385E828 Received: by mail-yb1-xb43.google.com with SMTP id p3so339793ybc.0 for ; Thu, 19 Mar 2020 07:18:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=T4cCyc0TqF5qCOfNtGIult7yaVIVo5pyarRypiCIB6I=; b=brzL7reI21v0p2MUFUSOb+NVCWoLmI52W8n3Ovdy59H2m4ZndqTahsIxN90YxM0N3T gUGvoJTURj0gAUDFRneyFT4TBRyawza6QA/frn5fA3iaFuBqktucq0URJIz9zCmBgB9P rTzWD8tBUn9z/VNw2wrvUwE4H3UFK6tiQOumgorsfDEm97oOsR0N+hrf1XAdXsl2Xgav m/nPUiXSL2tOY87CGIKXx5KH7ReuFF3MFrOPGSxGfJd9okCidgvXqSC8/RSCN9Q71gjA Kionb1tNwr7mB0fqpxsh42kNOSeCq7WAOlcRFgaBT8ftkRnrfE+s8g/aoLr5Q3iDQwHS NKSA== X-Gm-Message-State: ANhLgQ2sq4F2aBXkNDp3/dlZDTDgfsMED1ixEqPXM0v+pqjiWl+gsLLa vHOmTbur2juJeHyYEC1ZvJH0fLkQOjywlgXR7/xiNalR X-Google-Smtp-Source: ADFU+vv1z4ui4ycF9Ia1ZVseMZVPVhIWhWE78XIl5gZ3GgjBr3FY3Muov+tWfH9PRbJ18qVGciD9LidUK/EGqQQr96k= X-Received: by 2002:a25:9c46:: with SMTP id x6mr5055579ybo.69.1584627514841; Thu, 19 Mar 2020 07:18:34 -0700 (PDT) MIME-Version: 1.0 References: <20200319090205.74968-1-gprocida@google.com> <20200319125425.GC254272@google.com> In-Reply-To: <20200319125425.GC254272@google.com> From: Giuliano Procida Date: Thu, 19 Mar 2020 14:18:17 +0000 Message-ID: Subject: Re: [PATCH] abg-ir.cc: Remove always-true check. To: Matthias Maennich Cc: libabigail@sourceware.org, Dodji Seketeli , kernel-team@android.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-40.7 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, 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, USER_IN_DEF_SPF_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:18:37 -0000 Hi. On Thu, 19 Mar 2020 at 12:54, Matthias Maennich wrote: > > On Thu, Mar 19, 2020 at 09:02:05AM +0000, Android Kernel Team wrote: > >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. > > > >Signed-off-by: Giuliano Procida > >--- > > src/abg-ir.cc | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > > >diff --git a/src/abg-ir.cc b/src/abg-ir.cc > >index 13023295..83602b8a 100644 > >--- a/src/abg-ir.cc > >+++ b/src/abg-ir.cc > >@@ -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; > > I think the tabs got lost and hence formatting needs to be fixed. > But I generally agree with the patch. *sigh* v2 on the way. > Reviewed-by: Matthias Maennich > > Cheers, > Matthias > > > > > > for (class_or_union::data_members::const_iterator > > i = ty1->get_non_static_data_members().begin(), > >-- > >2.25.1.481.gfbce0eb801-goog > > > >