From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) by sourceware.org (Postfix) with ESMTPS id 5C590385701E; Fri, 28 Aug 2020 06:40:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5C590385701E Received: by mail-il1-x144.google.com with SMTP id k4so6986042ilr.12; Thu, 27 Aug 2020 23:40:32 -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=9MJRAvJlRQzKFONqjX7QlmItFT19mSAC8uGSEo2snLQ=; b=K7e33mcM5Qb5+6kYMWguM5dSJ2CZB8dCZqMrIVFSaamZ1//BXCqHxR4sP1Somf4X8U DdZ1UXE2wBFU0KEqJQvRYWTmMI0p5y3DDl2kbMT8BTI5p7jHMipxmfNSI8bQIi8mGR5W Qpt5AKe9DHR0+JsbGBqQVvGU0/H3tSSYUe8eZu918crW6D2EJm3b6H+ejetJteisb+u6 7BjQoi3iMshwgx8Ov6JJKqbfeoVV3W2n9TrMrbLPlMe+IJzlmFWz5UDLpwln9q5PD8ve o3bYGX8tbL6LJYVxBVGjjSBANOBEBCCxllk5FJxORJB4U2DN8a9DF2EY1DgDwP8W+DC6 A2ag== X-Gm-Message-State: AOAM5317XD/vp40UR9kNvavf3zdOhvs/FeVobP6LLlBEMSzjYRRmJBXd bjWRC87Szq9jrnkSNkuU0rZmtmNJKIfYaH1LUBE= X-Google-Smtp-Source: ABdhPJwcunhZlKkLrcwneMXEU7i6KnMAXCBbtUbt0pQNHUxXt2iwsnDeRhcersKb/9vPNYy4jQwE6x1fNAPvSpw/aW4= X-Received: by 2002:a92:aa94:: with SMTP id p20mr344563ill.266.1598596831767; Thu, 27 Aug 2020 23:40:31 -0700 (PDT) MIME-Version: 1.0 References: <20200824115953.GB618751@redhat.com> In-Reply-To: From: =?UTF-8?Q?Krystian_Ku=C5=BAniarek?= Date: Fri, 28 Aug 2020 08:40:20 +0200 Message-ID: Subject: Re: [PATCH] libstdc++: mark variables as possibly unused To: Jonathan Wakely Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 06:40:35 -0000 >Test suite confirmation: >All tests pass. Tested on both Manjaro and some Ubuntu 18.04 with gcc10 and gcc8 respectively. Jonathan, one more thing. I hope it's what you asked for cause all I did was: make bootstrap make check On Fri, 28 Aug 2020 at 08:32, Krystian Ku=C5=BAniarek < krystian.kuzniarek@gmail.com> wrote: > Ok, so here it is. > New diff: > > diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/inclu= de/bits/atomic_base.h > index 015acef83c4..c4a763aae5c 100644 > --- a/libstdc++-v3/include/bits/atomic_base.h > +++ b/libstdc++-v3/include/bits/atomic_base.h > @@ -231,7 +231,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > _GLIBCXX_ALWAYS_INLINE void > clear(memory_order __m =3D memory_order_seq_cst) noexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_consume); > __glibcxx_assert(__b !=3D memory_order_acquire); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > @@ -242,7 +243,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > _GLIBCXX_ALWAYS_INLINE void > clear(memory_order __m =3D memory_order_seq_cst) volatile noexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_consume); > __glibcxx_assert(__b !=3D memory_order_acquire); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > @@ -416,7 +418,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > _GLIBCXX_ALWAYS_INLINE void > store(__int_type __i, memory_order __m =3D memory_order_seq_cst) n= oexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_acquire); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > __glibcxx_assert(__b !=3D memory_order_consume); > @@ -428,7 +431,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > store(__int_type __i, > memory_order __m =3D memory_order_seq_cst) volatile noexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_acquire); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > __glibcxx_assert(__b !=3D memory_order_consume); > @@ -439,7 +443,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > _GLIBCXX_ALWAYS_INLINE __int_type > load(memory_order __m =3D memory_order_seq_cst) const noexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_release); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > > @@ -449,7 +454,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > _GLIBCXX_ALWAYS_INLINE __int_type > load(memory_order __m =3D memory_order_seq_cst) const volatile noe= xcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_release); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > > @@ -475,8 +481,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > compare_exchange_weak(__int_type& __i1, __int_type __i2, > memory_order __m1, memory_order __m2) noexcept > { > - memory_order __b2 =3D __m2 & __memory_order_mask; > - memory_order __b1 =3D __m1 & __memory_order_mask; > + memory_order __b2 __attribute__ ((__unused__)) > + =3D __m2 & __memory_order_mask; > + memory_order __b1 __attribute__ ((__unused__)) > + =3D __m1 & __memory_order_mask; > __glibcxx_assert(__b2 !=3D memory_order_release); > __glibcxx_assert(__b2 !=3D memory_order_acq_rel); > __glibcxx_assert(__b2 <=3D __b1); > @@ -490,8 +498,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > memory_order __m1, > memory_order __m2) volatile noexcept > { > - memory_order __b2 =3D __m2 & __memory_order_mask; > - memory_order __b1 =3D __m1 & __memory_order_mask; > + memory_order __b2 __attribute__ ((__unused__)) > + =3D __m2 & __memory_order_mask; > + memory_order __b1 __attribute__ ((__unused__)) > + =3D __m1 & __memory_order_mask; > __glibcxx_assert(__b2 !=3D memory_order_release); > __glibcxx_assert(__b2 !=3D memory_order_acq_rel); > __glibcxx_assert(__b2 <=3D __b1); > @@ -520,8 +530,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > compare_exchange_strong(__int_type& __i1, __int_type __i2, > memory_order __m1, memory_order __m2) noexcept > { > - memory_order __b2 =3D __m2 & __memory_order_mask; > - memory_order __b1 =3D __m1 & __memory_order_mask; > + memory_order __b2 __attribute__ ((__unused__)) > + =3D __m2 & __memory_order_mask; > + memory_order __b1 __attribute__ ((__unused__)) > + =3D __m1 & __memory_order_mask; > __glibcxx_assert(__b2 !=3D memory_order_release); > __glibcxx_assert(__b2 !=3D memory_order_acq_rel); > __glibcxx_assert(__b2 <=3D __b1); > @@ -535,8 +547,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > memory_order __m1, > memory_order __m2) volatile noexcept > { > - memory_order __b2 =3D __m2 & __memory_order_mask; > - memory_order __b1 =3D __m1 & __memory_order_mask; > + memory_order __b2 __attribute__ ((__unused__)) > + =3D __m2 & __memory_order_mask; > + memory_order __b1 __attribute__ ((__unused__)) > + =3D __m1 & __memory_order_mask; > > __glibcxx_assert(__b2 !=3D memory_order_release); > __glibcxx_assert(__b2 !=3D memory_order_acq_rel); > @@ -736,7 +750,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > store(__pointer_type __p, > memory_order __m =3D memory_order_seq_cst) noexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > > __glibcxx_assert(__b !=3D memory_order_acquire); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > @@ -749,7 +764,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > store(__pointer_type __p, > memory_order __m =3D memory_order_seq_cst) volatile noexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_acquire); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > __glibcxx_assert(__b !=3D memory_order_consume); > @@ -760,7 +776,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > _GLIBCXX_ALWAYS_INLINE __pointer_type > load(memory_order __m =3D memory_order_seq_cst) const noexcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_release); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > > @@ -770,7 +787,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > _GLIBCXX_ALWAYS_INLINE __pointer_type > load(memory_order __m =3D memory_order_seq_cst) const volatile noe= xcept > { > - memory_order __b =3D __m & __memory_order_mask; > + memory_order __b __attribute__ ((__unused__)) > + =3D __m & __memory_order_mask; > __glibcxx_assert(__b !=3D memory_order_release); > __glibcxx_assert(__b !=3D memory_order_acq_rel); > > @@ -797,8 +815,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > memory_order __m1, > memory_order __m2) noexcept > { > - memory_order __b2 =3D __m2 & __memory_order_mask; > - memory_order __b1 =3D __m1 & __memory_order_mask; > + memory_order __b2 __attribute__ ((__unused__)) > + =3D __m2 & __memory_order_mask; > + memory_order __b1 __attribute__ ((__unused__)) > + =3D __m1 & __memory_order_mask; > __glibcxx_assert(__b2 !=3D memory_order_release); > __glibcxx_assert(__b2 !=3D memory_order_acq_rel); > __glibcxx_assert(__b2 <=3D __b1); > @@ -812,8 +832,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > memory_order __m1, > memory_order __m2) volatile noexcept > { > - memory_order __b2 =3D __m2 & __memory_order_mask; > - memory_order __b1 =3D __m1 & __memory_order_mask; > + memory_order __b2 __attribute__ ((__unused__)) > + =3D __m2 & __memory_order_mask; > + memory_order __b1 __attribute__ ((__unused__)) > + =3D __m1 & __memory_order_mask; > > __glibcxx_assert(__b2 !=3D memory_order_release); > __glibcxx_assert(__b2 !=3D memory_order_acq_rel); > diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/incl= ude/ext/new_allocator.h > index 131718b8b2f..2e21a98409f 100644 > --- a/libstdc++-v3/include/ext/new_allocator.h > +++ b/libstdc++-v3/include/ext/new_allocator.h > @@ -117,7 +117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > // __p is not permitted to be a null pointer. > void > - deallocate(_Tp* __p, size_type __t) > + deallocate(_Tp* __p, size_type __t __attribute__ ((__unused__))) > { > #if __cpp_aligned_new > if (alignof(_Tp) > __STDCPP_DEFAULT_NEW_ALIGNMENT__) > > > Changelog entry: > > libstdc++-v3/ChangeLog: > > * include/bits/atomic_base.h: Fix -Wunused-variable > in system headers. > * include/ext/new_allocator.h: Fix -Wunused-parameter > in system headers. > > > Test suite confirmation: > All tests pass. Tested on both Manjaro and some Ubuntu 18.04 with gcc10 > and gcc8 respectively. > > On Mon, 24 Aug 2020 at 13:59, Jonathan Wakely wrote: > >> On 24/08/20 13:26 +0200, Krystian Ku=C5=BAniarek via Libstdc++ wrote: >> >Hi, >> > >> >First of all, sorry, I must have sent it as quoted-printable so spaces >> and >> >tabs are preserved. >> > >> >A description of the problem/bug and how your patch addresses it: >> >I've got a small patch for -Wunused-variable and -Wunused-parameter in >> >system headers. These are needed either for: >> >1) __glibcxx_assert() that quickly goes away during an early compilatio= n >> >step leaving the warning >> >2) code that conditionally is removed by preprocessor leaving the warni= ng >> > >> >Testcases: >> >N/A, it's only a warning. >> > >> >ChangeLog: >> >Sorry, contrib/mklog.py didn't quite work for me. >> >For some reason after instruction in line 129: "diff =3D PatchSet(data)= " my >> >"diff" variable is always empty. >> > >> >Bootstrapping and testing: >> >Tested that manually by recompling GCC, unfolding all headers with >> >`#include ` and compiling what's been included by it. >> > >> >The patch itself: >> > >> >diff --git a/libstdc++-v3/include/bits/atomic_base.h >> >b/libstdc++-v3/include/bits/atomic_base.h >> >index 015acef83c4..1fbb2d78d28 100644 >> >--- a/libstdc++-v3/include/bits/atomic_base.h >> >+++ b/libstdc++-v3/include/bits/atomic_base.h >> >@@ -231,7 +231,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION >> > _GLIBCXX_ALWAYS_INLINE void >> > clear(memory_order __m =3D memory_order_seq_cst) noexcept >> > { >> >- memory_order __b =3D __m & __memory_order_mask; >> >+ memory_order __b __attribute__ ((__unused__)) =3D >> >> Thanks for the patch. >> >> Please put the line break before the '=3D' character i.e. >> >> memory_order __b __attribute__ ((__unused__)) >> =3D __m & __memory_order_mask; >> >> Other than that, the patch looks ok, and simple enough to not need a >> copyright assignment for GCC. >> >> A changelog entry and confirmation the testsuite still runs would be >> preferred though. >> >>