From 7e4b9c4cd3b83be4c52eb475a6ef6b3fa4946cc5 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Tue, 23 Jun 2020 15:11:27 +0100 Subject: [PATCH] Improve -Wunused-value testcase build failures fix 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/ChangeLog b/gdb/testsuite/ChangeLog index 50dc4eae66e..18d19470d5b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2020-06-23 Gary Benson + Pedro Alves + + * 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. + 2020-06-23 Gary Benson * gdb.cp/namespace.cc: Avoid build failure with -Wunused-value. diff --git a/gdb/testsuite/gdb.cp/namespace.cc b/gdb/testsuite/gdb.cp/namespace.cc index 1ff34261bd4..8c78a7e9da6 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 5fc57b052fe..92a10907f9e 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 fc3e11fade5..ec992b23e84 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 9968c35e685..e3ea8744fd7 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 980a91acbe6..fa5c9d01f59 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 ed521020c96..eaae77fc8ca 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 eadb466d0cd..cd7c914d41a 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 eadb466d0cd..cd7c914d41a 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 -- 2.30.2