From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18847 invoked by alias); 30 Jul 2019 18:53:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 18767 invoked by uid 89); 30 Jul 2019 18:53:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=sk:tree_in, throwing, sk:IDENTIF X-HELO: mail-lf1-f65.google.com Received: from mail-lf1-f65.google.com (HELO mail-lf1-f65.google.com) (209.85.167.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 30 Jul 2019 18:53:22 +0000 Received: by mail-lf1-f65.google.com with SMTP id c9so45452945lfh.4 for ; Tue, 30 Jul 2019 11:53:21 -0700 (PDT) MIME-Version: 1.0 References: <20190712183859.GQ5989@redhat.com> <20190712224930.GT5989@redhat.com> <20190716123958.GD3469@redhat.com> In-Reply-To: From: Matthew Beliveau Date: Tue, 30 Jul 2019 19:46:00 -0000 Message-ID: Subject: Re: [C++ PATCH] PR c++/90590 Suppress warning for enumeration value not handled in switch warning To: Marek Polacek Cc: Jason Merrill , gcc-patches@gcc.gnu.org, Joseph Myers Content-Type: text/plain; charset="UTF-8" X-IsSubscribed: yes X-SW-Source: 2019-07/txt/msg01829.txt.bz2 ping On Tue, Jul 23, 2019 at 10:27 AM Matthew Beliveau wrote: > > ping > > On Tue, Jul 16, 2019 at 8:40 AM Marek Polacek wrote: > > > > On Mon, Jul 15, 2019 at 09:47:26AM -0400, Matthew Beliveau wrote: > > > Okay I kept the TYPE_MAIN_VARIANT and dropped the accidental new line! > > > Hopefully this should be fine! > > > > CCing Joseph as this is c-family/ stuff. > > > > > Bootstrapped/regtested on x86_64-linux, ok for trunk? > > > > > > 2019-07-12 Matthew Beliveau > > > > > > PR c++/90590 > > > * c-warn.c (c_do_switch_warnings): Suppress warning for enumerators > > > with reserved names that are in a system header. > > > > > > * c-c++-common/pr90590-1.c: New test. > > > * c-c++-common/pr90590-1.h: New test. > > > * c-c++-common/pr90590-2.c: New test. > > > * c-c++-common/pr90590-2.h: New test. > > > > > > diff --git gcc/c-family/c-warn.c gcc/c-family/c-warn.c > > > index b5d09e761d7..51c54a283e5 100644 > > > --- gcc/c-family/c-warn.c > > > +++ gcc/c-family/c-warn.c > > > @@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see > > > #include "gcc-rich-location.h" > > > #include "gimplify.h" > > > #include "c-family/c-indentation.h" > > > +#include "c-family/c-spellcheck.h" > > > #include "calls.h" > > > #include "stor-layout.h" > > > > > > @@ -1628,6 +1629,15 @@ c_do_switch_warnings (splay_tree cases, location_t switch_location, > > > if (cond && tree_int_cst_compare (cond, value)) > > > continue; > > > > > > + /* If the enumerator is defined in a system header and uses a reserved > > > + name, then we continue to avoid throwing a warning. */ > > > + location_t loc = DECL_SOURCE_LOCATION > > > + (TYPE_STUB_DECL (TYPE_MAIN_VARIANT (type))); > > > + if (in_system_header_at (loc) > > > + && name_reserved_for_implementation_p > > > + (IDENTIFIER_POINTER (TREE_PURPOSE (chain)))) > > > + continue; > > > + > > > /* If there is a default_node, the only relevant option is > > > Wswitch-enum. Otherwise, if both are enabled then we prefer > > > to warn using -Wswitch because -Wswitch is enabled by -Wall > > > diff --git gcc/testsuite/c-c++-common/pr90590-1.c gcc/testsuite/c-c++-common/pr90590-1.c > > > new file mode 100644 > > > index 00000000000..4e11debb7fa > > > --- /dev/null > > > +++ gcc/testsuite/c-c++-common/pr90590-1.c > > > @@ -0,0 +1,15 @@ > > > +// PR c++/90590 > > > +// { dg-options -Wswitch } > > > +#include "pr90590-1.h" > > > + > > > +void > > > +g () > > > +{ > > > + enum E e = _A; > > > + switch (e) // { dg-bogus "enumeration value '_C' not handled in switch" } > > > + { > > > + case _A: > > > + case _B: > > > + break; > > > + } > > > +} > > > diff --git gcc/testsuite/c-c++-common/pr90590-1.h gcc/testsuite/c-c++-common/pr90590-1.h > > > new file mode 100644 > > > index 00000000000..22f1a7d5d52 > > > --- /dev/null > > > +++ gcc/testsuite/c-c++-common/pr90590-1.h > > > @@ -0,0 +1,2 @@ > > > +#pragma GCC system_header > > > +enum E { _A, _B, _C }; > > > diff --git gcc/testsuite/c-c++-common/pr90590-2.c gcc/testsuite/c-c++-common/pr90590-2.c > > > new file mode 100644 > > > index 00000000000..23da97f9d74 > > > --- /dev/null > > > +++ gcc/testsuite/c-c++-common/pr90590-2.c > > > @@ -0,0 +1,11 @@ > > > +// PR c++/90590 > > > +// { dg-options -Wswitch } > > > + > > > +#include "pr90590-2.h" > > > + > > > +void > > > +fn () > > > +{ > > > + switch (c.b) // { dg-bogus "enumeration value" } > > > + ; > > > +} > > > diff --git gcc/testsuite/c-c++-common/pr90590-2.h gcc/testsuite/c-c++-common/pr90590-2.h > > > new file mode 100644 > > > index 00000000000..e4f8635576f > > > --- /dev/null > > > +++ gcc/testsuite/c-c++-common/pr90590-2.h > > > @@ -0,0 +1,4 @@ > > > +#pragma GCC system_header > > > +struct { > > > + enum { _A } b; > > > +} c; > > > > > > Marek