From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id 1D74E383E82B for ; Tue, 23 Jun 2020 14:14:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1D74E383E82B Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-141-0SLZuLXKOeapcHOraWwRLA-1; Tue, 23 Jun 2020 10:13:59 -0400 X-MC-Unique: 0SLZuLXKOeapcHOraWwRLA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E5B7C804003 for ; Tue, 23 Jun 2020 14:13:58 +0000 (UTC) Received: from blade.nx (ovpn-112-118.ams2.redhat.com [10.36.112.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A67D78FD3 for ; Tue, 23 Jun 2020 14:13:58 +0000 (UTC) Received: from blade.com (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id A8BFD816CCA9 for ; Tue, 23 Jun 2020 15:13:57 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [OB PATCH] Improve -Wunused-value testcase build failures fix Date: Tue, 23 Jun 2020 15:13:56 +0100 Message-Id: <1592921636-11410-1-git-send-email-gbenson@redhat.com> In-Reply-To: <27d9d693-8afb-d07f-6d14-d867d42babdd@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-15.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 14:14:03 -0000 This commit improves upon my previous -Wunused-value fix by replacing the various dummy variables with casts to void, as suggested by Pedro. gdb/testsuite/ChangeLog: * gdb.cp/namespace.cc: Improve -Wunused-value fix. * gdb.cp/nsimport.cc: Likewise. * gdb.cp/nsnested.cc: Likewise. * gdb.cp/nsnoimports.cc: Likewise. * gdb.cp/nsusing.cc: Likewise. * gdb.cp/smartp.cc: Likewise. * gdb.python/py-pp-integral.c: Likewise. * gdb.python/py-pp-re-notag.c: Likewise. --- gdb/testsuite/ChangeLog | 12 ++++++++++++ gdb/testsuite/gdb.cp/namespace.cc | 22 +++++++++++----------- gdb/testsuite/gdb.cp/nsimport.cc | 6 +++--- gdb/testsuite/gdb.cp/nsnested.cc | 2 +- gdb/testsuite/gdb.cp/nsnoimports.cc | 12 ++++++------ gdb/testsuite/gdb.cp/nsusing.cc | 12 ++++++------ gdb/testsuite/gdb.cp/smartp.cc | 8 ++++---- gdb/testsuite/gdb.python/py-pp-integral.c | 4 ++-- gdb/testsuite/gdb.python/py-pp-re-notag.c | 4 ++-- 9 files changed, 47 insertions(+), 35 deletions(-) diff --git a/gdb/testsuite/gdb.cp/namespace.cc b/gdb/testsuite/gdb.cp/namespace.cc index 1ff3426..8c78a7e 100644 --- a/gdb/testsuite/gdb.cp/namespace.cc +++ b/gdb/testsuite/gdb.cp/namespace.cc @@ -150,22 +150,22 @@ namespace C // plan to have GDB try to print out, just to make sure that the // compiler and I agree which ones should be legal! It's easy // to screw up when testing the boundaries of namespace stuff. - int unused1 = c; + (void) c; //cc; - int unused2 = C::cc; - int unused3 = cd; + (void) C::cc; + (void) cd; //C::D::cd; - int unused4 = E::cde; - int unused5 = shadow; + (void) E::cde; + (void) shadow; //E::ce; - int unused6 = cX; - int unused7 = F::cXf; - int unused8 = F::cXfX; - int unused9 = X; - int unusedA = G::Xg; + (void) cX; + (void) F::cXf; + (void) F::cXfX; + (void) X; + (void) G::Xg; //cXOtherFile; //XOtherFile; - int unusedB = G::XgX; + (void) G::XgX; return; } diff --git a/gdb/testsuite/gdb.cp/nsimport.cc b/gdb/testsuite/gdb.cp/nsimport.cc index 5fc57b0..92a1090 100644 --- a/gdb/testsuite/gdb.cp/nsimport.cc +++ b/gdb/testsuite/gdb.cp/nsimport.cc @@ -13,8 +13,8 @@ namespace{ int main() { - int unused1 = x; - int unused2 = xx; - int unused3 = xxx; + (void) x; + (void) xx; + (void) xxx; return 0; } diff --git a/gdb/testsuite/gdb.cp/nsnested.cc b/gdb/testsuite/gdb.cp/nsnested.cc index fc3e11f..ec992b2 100644 --- a/gdb/testsuite/gdb.cp/nsnested.cc +++ b/gdb/testsuite/gdb.cp/nsnested.cc @@ -15,7 +15,7 @@ namespace C int second() { - int unused = ab; + (void) ab; return 0; } } diff --git a/gdb/testsuite/gdb.cp/nsnoimports.cc b/gdb/testsuite/gdb.cp/nsnoimports.cc index 9968c35..e3ea874 100644 --- a/gdb/testsuite/gdb.cp/nsnoimports.cc +++ b/gdb/testsuite/gdb.cp/nsnoimports.cc @@ -18,9 +18,9 @@ namespace A } int first(){ - int unused1 = _a; - int unused2 = ab; - int unused3 = C::abc; + (void) _a; + (void) ab; + (void) C::abc; return C::second(); } } @@ -30,8 +30,8 @@ namespace A int main() { - int unused1 = A::_a; - int unused2 = A::B::ab; - int unused3 = A::B::C::abc; + (void) A::_a; + (void) A::B::ab; + (void) A::B::C::abc; return A::B::first(); } diff --git a/gdb/testsuite/gdb.cp/nsusing.cc b/gdb/testsuite/gdb.cp/nsusing.cc index 980a91a..fa5c9d0 100644 --- a/gdb/testsuite/gdb.cp/nsusing.cc +++ b/gdb/testsuite/gdb.cp/nsusing.cc @@ -35,7 +35,7 @@ namespace L using namespace J; int marker8 () { - int unused = jx; + (void) jx; return K::marker9 (); } } @@ -53,7 +53,7 @@ namespace I int marker7 () { using namespace G::H; - int unused = ghx; + (void) ghx; return L::marker8 (); } } @@ -69,7 +69,7 @@ namespace E using namespace E::F; int marker6 () { - int unused = efx; + (void) efx; return I::marker7 (); } @@ -92,7 +92,7 @@ namespace D using namespace C; int marker5 () { - int unused = cc; + (void) cc; return marker6 (); } @@ -110,7 +110,7 @@ int marker3 () int marker2 () { namespace B = A; - int unused = B::_a; + (void) B::_a; return marker3 (); } @@ -134,6 +134,6 @@ int marker1 () int main () { using namespace A; - int unused = _a; + (void) _a; return marker1 (); } diff --git a/gdb/testsuite/gdb.cp/smartp.cc b/gdb/testsuite/gdb.cp/smartp.cc index ed52102..eaae77f 100644 --- a/gdb/testsuite/gdb.cp/smartp.cc +++ b/gdb/testsuite/gdb.cp/smartp.cc @@ -131,12 +131,12 @@ int main(){ sp3->foo(1); sp3->foo('a'); - int unused1 = sp4->a; - int unused2 = sp4->b; + (void) sp4->a; + (void) sp4->b; Type4 *mt4p = &mt4; - int unused3 = mt4p->a; - int unused4 = mt4p->b; + (void) mt4p->a; + (void) mt4p->b; A a; B b; diff --git a/gdb/testsuite/gdb.python/py-pp-integral.c b/gdb/testsuite/gdb.python/py-pp-integral.c index eadb466..cd7c914 100644 --- a/gdb/testsuite/gdb.python/py-pp-integral.c +++ b/gdb/testsuite/gdb.python/py-pp-integral.c @@ -17,10 +17,10 @@ typedef long time_t; -static time_t +static void tick_tock (time_t *t) { - return *t++; + (void) *t++; } int diff --git a/gdb/testsuite/gdb.python/py-pp-re-notag.c b/gdb/testsuite/gdb.python/py-pp-re-notag.c index eadb466..cd7c914 100644 --- a/gdb/testsuite/gdb.python/py-pp-re-notag.c +++ b/gdb/testsuite/gdb.python/py-pp-re-notag.c @@ -17,10 +17,10 @@ typedef long time_t; -static time_t +static void tick_tock (time_t *t) { - return *t++; + (void) *t++; } int -- 1.8.3.1