public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Patrick Palka <ppalka@redhat.com>
To: Patrick Palka <ppalka@redhat.com>
Cc: gcc-patches@gcc.gnu.org, jason@redhat.com
Subject: Re: [PATCH] c++: make some cp_trait_kind switch statements exhaustive
Date: Fri, 30 Sep 2022 13:37:35 -0400 (EDT)	[thread overview]
Message-ID: <5dacc85d-d972-aed1-fac4-a325c5422a50@idea> (raw)
In-Reply-To: <20220930172019.1459433-1-ppalka@redhat.com>


On Fri, 30 Sep 2022, Patrick Palka wrote:

> This replaces the unreachable default case in some cp_trait_kind
> switches with an exhaustive listing of the _unexpected_ trait codes,
> so that when adding a new trait we'll get a -Wswitch diagnostic if we
> forget to handle the trait code in one of these switches.
> 
> Bootstrappend and regtested on x86_64-pc-linux-gnu, does this look OK
> for trunk?
> 
> gcc/cp/ChangeLog:
> 
> 	* semantics.cc (trait_expr_value): Make cp_trait_kind switch
> 	exhaustive.
> 	(finish_trait_expr): Likewise.
> 	(finish_trait_type): Likewise.
> ---
>  gcc/cp/semantics.cc | 31 +++++++++++++++++++++++++------
>  1 file changed, 25 insertions(+), 6 deletions(-)
> 
> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> index 66ee2186a84..91ad8aa340f 100644
> --- a/gcc/cp/semantics.cc
> +++ b/gcc/cp/semantics.cc
> @@ -12052,10 +12052,15 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
>      case CPTK_REF_CONVERTS_FROM_TEMPORARY:
>        return ref_xes_from_temporary (type1, type2, /*direct_init=*/false);
>  
> -    default:
> -      gcc_unreachable ();
> -      return false;
> +#define DEFTRAIT_TYPE(CODE, NAME, ARITY) \
> +    case CPTK_##CODE:
> +#include "cp-trait.def"
> +#undef DEFTRAIT_EXPR

Whoops, this should be #undef DEFTRAIT_TYPE

> +      /* These are handled by finish_trait_type.  */
> +      break;
>      }
> +
> +  gcc_unreachable ();
>  }
>  
>  /* Returns true if TYPE meets the requirements for the specified KIND,
> @@ -12204,7 +12209,11 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
>  	return error_mark_node;
>        break;
>  
> -    default:
> +#define DEFTRAIT_TYPE(CODE, NAME, ARITY) \
> +    case CPTK_##CODE:
> +#include "cp-trait.def"
> +#undef DEFTRAIT_TYPE
> +      /* These are handled by finish_trait_type.  */
>        gcc_unreachable ();
>      }
>  
> @@ -12250,9 +12259,19 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2)
>        if (TYPE_REF_P (type1))
>  	type1 = TREE_TYPE (type1);
>        return cv_unqualified (type1);
> -    default:
> -      gcc_unreachable ();
> +
> +#define DEFTRAIT_EXPR(CODE, NAME, ARITY) \
> +    case CPTK_##CODE:
> +#include "cp-trait.def"
> +#undef DEFTRAIT_EXPR
> +      /* These are handled by finish_trait_expr.  */
> +    case CPTK_BASES:
> +    case CPTK_DIRECT_BASES:
> +      /* These are handled by finish_bases.  */
> +      break;
>      }
> +
> +  gcc_unreachable ();
>  }
>  
>  /* Do-nothing variants of functions to handle pragma FLOAT_CONST_DECIMAL64,
> -- 
> 2.38.0.rc2
> 
> 


  reply	other threads:[~2022-09-30 17:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-30 17:20 Patrick Palka
2022-09-30 17:37 ` Patrick Palka [this message]
2022-09-30 19:46   ` Jason Merrill

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5dacc85d-d972-aed1-fac4-a325c5422a50@idea \
    --to=ppalka@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=jason@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).