From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x92d.google.com (mail-ua1-x92d.google.com [IPv6:2607:f8b0:4864:20::92d]) by sourceware.org (Postfix) with ESMTPS id AB31D3858D28 for ; Wed, 11 Oct 2023 21:35:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AB31D3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=cs.washington.edu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cs.washington.edu Received: by mail-ua1-x92d.google.com with SMTP id a1e0cc1a2514c-7ab4c86eeb0so132856241.2 for ; Wed, 11 Oct 2023 14:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1697060126; x=1697664926; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=YcuK9aPfsFF1/hfDDKQAkvbBjna2L9xjvlLVkhnYSzQ=; b=cdas96vQggzW5FulZNSA+4+iAdyo0jaV/BvZ8m4gJk62v5wmyXkqokhO4FIwBpMiwP US92ceiHQpgdN6pKFsRd5zWOc2K/IabGcax+xiPMPi2SWl+gI4o0njwUrLi2Agq8GsYk YS9/v2dOaVdA05HdsxMJ/6M2NJIsz6vVF8hiQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697060126; x=1697664926; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YcuK9aPfsFF1/hfDDKQAkvbBjna2L9xjvlLVkhnYSzQ=; b=qc/EOVZ2OpBXTRHDOWqlpMi7DwMeqcnXalEp5yE/LzO66p5fFgvsUFltILRbYXatBS IrQibvfFIFuLWTT6QbZDIYD4Zba6vIPVK7dyNpKAbNB7h6HKTjlKHF4JHpxaw2D7JD0J w6i+C2mArniDMAwQI7qDdHAuxDHP5EgTzSDkQYCa35PQVmQl1qznVgRORUhX7dlwSC+g Yz59h7calR39x3z1o5I3RTEzescFDHJg7yQu68Zi9knm36vSN+WH1ysnADsO/OWkdKdU 4HpUn6U22hl+k3h2UcPhvPZvPk/87SY0a6lqwVDiXHZpfcmeT17BP/941htJAPwH9VrG s+MA== X-Gm-Message-State: AOJu0YxOLMlTeQ5yvCqig7ZJU5Pe5YRPzYK8NskInLvAQFni+odWk5JP uuKiF+L4jKNskFwHqTnLoJOBgLykbraDIg1Yq/gWdw== X-Google-Smtp-Source: AGHT+IGk51xBGR4y0TzzN2XqR0qW7vIpHsQ8XbySvfgOJMiGFOWSBwM2ww6Z8B73bITX98DgDq7NJq+8sJUO6xSSd/k= X-Received: by 2002:a1f:4a45:0:b0:496:b3b7:5d4c with SMTP id x66-20020a1f4a45000000b00496b3b75d4cmr13867646vka.16.1697060125756; Wed, 11 Oct 2023 14:35:25 -0700 (PDT) MIME-Version: 1.0 References: <20231010095229.3364786-1-kmatsui@gcc.gnu.org> <20231010221520.3680267-1-kmatsui@gcc.gnu.org> <20231010221520.3680267-3-kmatsui@gcc.gnu.org> <885b17e9-866f-4cef-12b8-d44c3b350d31@idea> In-Reply-To: <885b17e9-866f-4cef-12b8-d44c3b350d31@idea> From: Ken Matsui Date: Wed, 11 Oct 2023 14:34:48 -0700 Message-ID: Subject: Re: [PATCH v16 02/39] c-family, c++: Look up built-in traits through gperf To: Patrick Palka Cc: Ken Matsui , gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, jason@redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SCC_5_SHORT_WORD_LINES,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, Oct 11, 2023 at 1:09=E2=80=AFPM Patrick Palka w= rote: > > On Tue, 10 Oct 2023, Ken Matsui wrote: > > > Since RID_MAX soon reaches 255 and all traits are used approximately on= ce in > > a C++ translation unit, this patch instead uses only RID_TRAIT_EXPR and > > RID_TRAIT_TYPE for all traits and uses gperf to look up the specific tr= ait. > > Nice! This looks good to me, but I wonder what the corresponding > ridpointers entry should be for RID_TRAIT_TYPE and RID_TRAIT_EXPR? It > seems we currently assume every rid code has a unique canonical spelling > which we keep in ridpointers[RID_FOO], but that's of course not the case > for RID_TRAIT_TYPE and RID_TRAIT_EXPR. Maybe we should make > init_reswords() keep the ridpointers entry empty for RID_TRAIT_EXPR and > RID_TRAIT_TYPE? > That makes sense. I will update this patch. Thank you for your review! > > > > gcc/c-family/ChangeLog: > > > > * c-common.cc (c_common_reswords): Map all traits to RID_TRAIT_EX= PR > > and RID_TRAIT_TYPE instead. > > * c-common.h (enum rid): Remove all existing RID values for trait= s. > > Use RID_TRAIT_EXPR and RID_TRAIT_TYPE instead. > > > > gcc/cp/ChangeLog: > > > > * Make-lang.in: Add targets to generate cp-trait.gperf and > > cp-trait.h. > > * cp-objcp-common.cc (names_builtin_p): Remove all existing RID v= alues > > for traits. Use RID_TRAIT_EXPR and RID_TRAIT_TYPE instead. > > * parser.cc (cp_keyword_starts_decl_specifier_p): Likewise, for > > type-yielding traits. Use RID_TRAIT_TYPE instead. > > (cp_parser_simple_type_specifier): Likewise. > > (cp_parser_primary_expression): Likewise, for expression-yielding > > traits. Use RID_TRAIT_EXPR instead. > > (cp_parser_trait): Look up traits through gperf instead of enum r= id. > > * cp-trait-head.in: New file. > > * cp-trait.gperf: New file. > > * cp-trait.h: New file. > > > > Signed-off-by: Ken Matsui > > --- > > gcc/c-family/c-common.cc | 12 +- > > gcc/c-family/c-common.h | 7 +- > > gcc/cp/Make-lang.in | 24 ++++ > > gcc/cp/cp-objcp-common.cc | 6 +- > > gcc/cp/cp-trait-head.in | 30 +++++ > > gcc/cp/cp-trait.gperf | 74 ++++++++++++ > > gcc/cp/cp-trait.h | 247 ++++++++++++++++++++++++++++++++++++++ > > gcc/cp/parser.cc | 70 ++++------- > > 8 files changed, 412 insertions(+), 58 deletions(-) > > create mode 100644 gcc/cp/cp-trait-head.in > > create mode 100644 gcc/cp/cp-trait.gperf > > create mode 100644 gcc/cp/cp-trait.h > > > > diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc > > index f044db5b797..f219ccd29e5 100644 > > --- a/gcc/c-family/c-common.cc > > +++ b/gcc/c-family/c-common.cc > > @@ -508,12 +508,16 @@ const struct c_common_resword c_common_reswords[]= =3D > > { "wchar_t", RID_WCHAR, D_CXXONLY }, > > { "while", RID_WHILE, 0 }, > > > > -#define DEFTRAIT(TCC, CODE, NAME, ARITY) \ > > - { NAME, RID_##CODE, D_CXXONLY }, > > +#define DEFTRAIT_EXPR(CODE, NAME, ARITY) \ > > + { NAME, RID_TRAIT_EXPR, D_CXXONLY }, > > #include "cp/cp-trait.def" > > -#undef DEFTRAIT > > +#undef DEFTRAIT_EXPR > > /* An alias for __is_same. */ > > - { "__is_same_as", RID_IS_SAME, D_CXXONLY }, > > + { "__is_same_as", RID_TRAIT_EXPR, D_CXXONLY }, > > +#define DEFTRAIT_TYPE(CODE, NAME, ARITY) \ > > + { NAME, RID_TRAIT_TYPE, D_CXXONLY }, > > +#include "cp/cp-trait.def" > > +#undef DEFTRAIT_TYPE > > > > /* C++ transactional memory. */ > > { "synchronized", RID_SYNCHRONIZED, D_CXX_OBJC | D_TRANSMEM }, > > diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h > > index 1fdba7ef3ea..a1a641f4175 100644 > > --- a/gcc/c-family/c-common.h > > +++ b/gcc/c-family/c-common.h > > @@ -168,10 +168,9 @@ enum rid > > RID_BUILTIN_LAUNDER, > > RID_BUILTIN_BIT_CAST, > > > > -#define DEFTRAIT(TCC, CODE, NAME, ARITY) \ > > - RID_##CODE, > > -#include "cp/cp-trait.def" > > -#undef DEFTRAIT > > + /* C++ traits, defined in cp-trait.def. */ > > + RID_TRAIT_EXPR, > > + RID_TRAIT_TYPE, > > > > /* C++11 */ > > RID_CONSTEXPR, RID_DECLTYPE, RID_NOEXCEPT, RID_NULLPTR, RID_STATIC_A= SSERT, > > diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in > > index 2727fb7f8cc..8d4e3a1f594 100644 > > --- a/gcc/cp/Make-lang.in > > +++ b/gcc/cp/Make-lang.in > > @@ -34,6 +34,8 @@ > > # - the compiler proper (eg: cc1plus) > > # - define the names for selecting the language in LANGUAGES. > > > > +AWK =3D @AWK@ > > + > > # Actual names to use when installing a native compiler. > > CXX_INSTALL_NAME :=3D $(shell echo c++|sed '$(program_transform_name)'= ) > > GXX_INSTALL_NAME :=3D $(shell echo g++|sed '$(program_transform_name)'= ) > > @@ -186,6 +188,28 @@ endif > > # This is the file that depends on the generated header file. > > cp/name-lookup.o: $(srcdir)/cp/std-name-hint.h > > > > +# We always need the dependency on the .gperf file because it itself i= s generated. > > +ifeq ($(ENABLE_MAINTAINER_RULES), true) > > +$(srcdir)/cp/cp-trait.h: $(srcdir)/cp/cp-trait.gperf > > +else > > +$(srcdir)/cp/cp-trait.h: | $(srcdir)/cp/cp-trait.gperf > > +endif > > + gperf -o -C -E -k '8' -D -N 'find' -L C++ \ > > + $(srcdir)/cp/cp-trait.gperf --output-file $(srcdir)/cp/cp= -trait.h > > + > > +# The cp-trait.gperf file itself is generated from a cp-trait.def file= . > > +$(srcdir)/cp/cp-trait.gperf: $(srcdir)/cp/cp-trait.def $(srcdir)/cp/cp= -trait-head.in > > + cat $(srcdir)/cp/cp-trait-head.in > $@ > > + $(AWK) -F', *' '/^DEFTRAIT_/ { \ > > + type =3D (index($$1, "DEFTRAIT_TYPE") !=3D 0 ? "true" : "= false"); \ > > + gsub(/DEFTRAIT_(EXPR|TYPE) \(/, "", $$1); \ > > + gsub(/\)/, "", $$3); \ > > + print $$2", CPTK_" $$1", "$$3", "type; \ > > + }' $(srcdir)/cp/cp-trait.def >> $@ > > + > > +# This is the file that depends on the generated header file. > > +cp/parser.o: $(srcdir)/cp/cp-trait.h > > + > > components_in_prev =3D "bfd opcodes binutils fixincludes gas gcc gmp m= pfr mpc isl gold intl ld libbacktrace libcpp libcody libdecnumber libiberty= libiberty-linker-plugin libiconv zlib lto-plugin libctf libsframe" > > components_in_prev_target =3D "libstdc++-v3 libsanitizer libvtv libgcc= libbacktrace libphobos zlib libgomp libatomic" > > > > diff --git a/gcc/cp/cp-objcp-common.cc b/gcc/cp/cp-objcp-common.cc > > index 93b027b80ce..c414d8f5a13 100644 > > --- a/gcc/cp/cp-objcp-common.cc > > +++ b/gcc/cp/cp-objcp-common.cc > > @@ -434,10 +434,8 @@ names_builtin_p (const char *name) > > case RID_BUILTIN_ASSOC_BARRIER: > > case RID_BUILTIN_BIT_CAST: > > case RID_OFFSETOF: > > -#define DEFTRAIT(TCC, CODE, NAME, ARITY) \ > > - case RID_##CODE: > > -#include "cp-trait.def" > > -#undef DEFTRAIT > > + case RID_TRAIT_EXPR: > > + case RID_TRAIT_TYPE: > > return true; > > default: > > break; > > diff --git a/gcc/cp/cp-trait-head.in b/gcc/cp/cp-trait-head.in > > new file mode 100644 > > index 00000000000..9357eea1238 > > --- /dev/null > > +++ b/gcc/cp/cp-trait-head.in > > @@ -0,0 +1,30 @@ > > +%language=3DC++ > > +%define class-name cp_trait_lookup > > +%struct-type > > +%{ > > +/* Copyright (C) 2023 Free Software Foundation, Inc. > > + > > +This file is part of GCC. > > + > > +GCC is free software; you can redistribute it and/or modify it under > > +the terms of the GNU General Public License as published by the Free > > +Software Foundation; either version 3, or (at your option) any later > > +version. > > + > > +GCC is distributed in the hope that it will be useful, but WITHOUT ANY > > +WARRANTY; without even the implied warranty of MERCHANTABILITY or > > +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License > > +for more details. > > + > > +You should have received a copy of the GNU General Public License > > +along with GCC; see the file COPYING3. If not see > > +. */ > > +%} > > +struct cp_trait { > > + const char *name; > > + enum cp_trait_kind kind; > > + short arity; > > + bool type; > > +}; > > +%% > > +"__is_same_as", CPTK_IS_SAME, 2, false > > diff --git a/gcc/cp/cp-trait.gperf b/gcc/cp/cp-trait.gperf > > new file mode 100644 > > index 00000000000..47e3c1af499 > > --- /dev/null > > +++ b/gcc/cp/cp-trait.gperf > > @@ -0,0 +1,74 @@ > > +%language=3DC++ > > +%define class-name cp_trait_lookup > > +%struct-type > > +%{ > > +/* Copyright (C) 2023 Free Software Foundation, Inc. > > + > > +This file is part of GCC. > > + > > +GCC is free software; you can redistribute it and/or modify it under > > +the terms of the GNU General Public License as published by the Free > > +Software Foundation; either version 3, or (at your option) any later > > +version. > > + > > +GCC is distributed in the hope that it will be useful, but WITHOUT ANY > > +WARRANTY; without even the implied warranty of MERCHANTABILITY or > > +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License > > +for more details. > > + > > +You should have received a copy of the GNU General Public License > > +along with GCC; see the file COPYING3. If not see > > +. */ > > +%} > > +struct cp_trait { > > + const char *name; > > + enum cp_trait_kind kind; > > + short arity; > > + bool type; > > +}; > > +%% > > +"__is_same_as", CPTK_IS_SAME, 2, false > > +"__has_nothrow_assign", CPTK_HAS_NOTHROW_ASSIGN, 1, false > > +"__has_nothrow_constructor", CPTK_HAS_NOTHROW_CONSTRUCTOR, 1, false > > +"__has_nothrow_copy", CPTK_HAS_NOTHROW_COPY, 1, false > > +"__has_trivial_assign", CPTK_HAS_TRIVIAL_ASSIGN, 1, false > > +"__has_trivial_constructor", CPTK_HAS_TRIVIAL_CONSTRUCTOR, 1, false > > +"__has_trivial_copy", CPTK_HAS_TRIVIAL_COPY, 1, false > > +"__has_trivial_destructor", CPTK_HAS_TRIVIAL_DESTRUCTOR, 1, false > > +"__has_unique_object_representations", CPTK_HAS_UNIQUE_OBJ_REPRESENTAT= IONS, 1, false > > +"__has_virtual_destructor", CPTK_HAS_VIRTUAL_DESTRUCTOR, 1, false > > +"__is_abstract", CPTK_IS_ABSTRACT, 1, false > > +"__is_aggregate", CPTK_IS_AGGREGATE, 1, false > > +"__is_assignable", CPTK_IS_ASSIGNABLE, 2, false > > +"__is_base_of", CPTK_IS_BASE_OF, 2, false > > +"__is_class", CPTK_IS_CLASS, 1, false > > +"__is_constructible", CPTK_IS_CONSTRUCTIBLE, -1, false > > +"__is_convertible", CPTK_IS_CONVERTIBLE, 2, false > > +"__is_empty", CPTK_IS_EMPTY, 1, false > > +"__is_enum", CPTK_IS_ENUM, 1, false > > +"__is_final", CPTK_IS_FINAL, 1, false > > +"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, 2, false > > +"__is_literal_type", CPTK_IS_LITERAL_TYPE, 1, false > > +"__is_nothrow_assignable", CPTK_IS_NOTHROW_ASSIGNABLE, 2, false > > +"__is_nothrow_constructible", CPTK_IS_NOTHROW_CONSTRUCTIBLE, -1, false > > +"__is_nothrow_convertible", CPTK_IS_NOTHROW_CONVERTIBLE, 2, false > > +"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTI= BLE_BASE_OF, 2, false > > +"__is_pod", CPTK_IS_POD, 1, false > > +"__is_polymorphic", CPTK_IS_POLYMORPHIC, 1, false > > +"__is_same", CPTK_IS_SAME, 2, false > > +"__is_standard_layout", CPTK_IS_STD_LAYOUT, 1, false > > +"__is_trivial", CPTK_IS_TRIVIAL, 1, false > > +"__is_trivially_assignable", CPTK_IS_TRIVIALLY_ASSIGNABLE, 2, false > > +"__is_trivially_constructible", CPTK_IS_TRIVIALLY_CONSTRUCTIBLE, -1, f= alse > > +"__is_trivially_copyable", CPTK_IS_TRIVIALLY_COPYABLE, 1, false > > +"__is_union", CPTK_IS_UNION, 1, false > > +"__reference_constructs_from_temporary", CPTK_REF_CONSTRUCTS_FROM_TEMP= ORARY, 2, false > > +"__reference_converts_from_temporary", CPTK_REF_CONVERTS_FROM_TEMPORAR= Y, 2, false > > +"__remove_cv", CPTK_REMOVE_CV, 1, true > > +"__remove_cvref", CPTK_REMOVE_CVREF, 1, true > > +"__remove_reference", CPTK_REMOVE_REFERENCE, 1, true > > +"__type_pack_element", CPTK_TYPE_PACK_ELEMENT, -1, true > > +"__underlying_type", CPTK_UNDERLYING_TYPE, 1, true > > +"__is_deducible ", CPTK_IS_DEDUCIBLE, 2, false > > +"__bases", CPTK_BASES, 1, true > > +"__direct_bases", CPTK_DIRECT_BASES, 1, true > > diff --git a/gcc/cp/cp-trait.h b/gcc/cp/cp-trait.h > > new file mode 100644 > > index 00000000000..97ba8492d15 > > --- /dev/null > > +++ b/gcc/cp/cp-trait.h > > @@ -0,0 +1,247 @@ > > +/* C++ code produced by gperf version 3.1 */ > > +/* Command-line: gperf -o -C -E -k 8 -D -N find -L C++ --output-file .= ./../gcc/cp/cp-trait.h ../../gcc/cp/cp-trait.gperf */ > > + > > +#if !((' ' =3D=3D 32) && ('!' =3D=3D 33) && ('"' =3D=3D 34) && ('#' = =3D=3D 35) \ > > + && ('%' =3D=3D 37) && ('&' =3D=3D 38) && ('\'' =3D=3D 39) && ('(= ' =3D=3D 40) \ > > + && (')' =3D=3D 41) && ('*' =3D=3D 42) && ('+' =3D=3D 43) && (','= =3D=3D 44) \ > > + && ('-' =3D=3D 45) && ('.' =3D=3D 46) && ('/' =3D=3D 47) && ('0'= =3D=3D 48) \ > > + && ('1' =3D=3D 49) && ('2' =3D=3D 50) && ('3' =3D=3D 51) && ('4'= =3D=3D 52) \ > > + && ('5' =3D=3D 53) && ('6' =3D=3D 54) && ('7' =3D=3D 55) && ('8'= =3D=3D 56) \ > > + && ('9' =3D=3D 57) && (':' =3D=3D 58) && (';' =3D=3D 59) && ('<'= =3D=3D 60) \ > > + && ('=3D' =3D=3D 61) && ('>' =3D=3D 62) && ('?' =3D=3D 63) && ('= A' =3D=3D 65) \ > > + && ('B' =3D=3D 66) && ('C' =3D=3D 67) && ('D' =3D=3D 68) && ('E'= =3D=3D 69) \ > > + && ('F' =3D=3D 70) && ('G' =3D=3D 71) && ('H' =3D=3D 72) && ('I'= =3D=3D 73) \ > > + && ('J' =3D=3D 74) && ('K' =3D=3D 75) && ('L' =3D=3D 76) && ('M'= =3D=3D 77) \ > > + && ('N' =3D=3D 78) && ('O' =3D=3D 79) && ('P' =3D=3D 80) && ('Q'= =3D=3D 81) \ > > + && ('R' =3D=3D 82) && ('S' =3D=3D 83) && ('T' =3D=3D 84) && ('U'= =3D=3D 85) \ > > + && ('V' =3D=3D 86) && ('W' =3D=3D 87) && ('X' =3D=3D 88) && ('Y'= =3D=3D 89) \ > > + && ('Z' =3D=3D 90) && ('[' =3D=3D 91) && ('\\' =3D=3D 92) && (']= ' =3D=3D 93) \ > > + && ('^' =3D=3D 94) && ('_' =3D=3D 95) && ('a' =3D=3D 97) && ('b'= =3D=3D 98) \ > > + && ('c' =3D=3D 99) && ('d' =3D=3D 100) && ('e' =3D=3D 101) && ('= f' =3D=3D 102) \ > > + && ('g' =3D=3D 103) && ('h' =3D=3D 104) && ('i' =3D=3D 105) && (= 'j' =3D=3D 106) \ > > + && ('k' =3D=3D 107) && ('l' =3D=3D 108) && ('m' =3D=3D 109) && (= 'n' =3D=3D 110) \ > > + && ('o' =3D=3D 111) && ('p' =3D=3D 112) && ('q' =3D=3D 113) && (= 'r' =3D=3D 114) \ > > + && ('s' =3D=3D 115) && ('t' =3D=3D 116) && ('u' =3D=3D 117) && (= 'v' =3D=3D 118) \ > > + && ('w' =3D=3D 119) && ('x' =3D=3D 120) && ('y' =3D=3D 121) && (= 'z' =3D=3D 122) \ > > + && ('{' =3D=3D 123) && ('|' =3D=3D 124) && ('}' =3D=3D 125) && (= '~' =3D=3D 126)) > > +/* The character set is not based on ISO-646. */ > > +#error "gperf generated tables don't work with this execution characte= r set. Please report a bug to ." > > +#endif > > + > > +#line 4 "../../gcc/cp/cp-trait.gperf" > > + > > +/* Copyright (C) 2023 Free Software Foundation, Inc. > > + > > +This file is part of GCC. > > + > > +GCC is free software; you can redistribute it and/or modify it under > > +the terms of the GNU General Public License as published by the Free > > +Software Foundation; either version 3, or (at your option) any later > > +version. > > + > > +GCC is distributed in the hope that it will be useful, but WITHOUT ANY > > +WARRANTY; without even the implied warranty of MERCHANTABILITY or > > +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License > > +for more details. > > + > > +You should have received a copy of the GNU General Public License > > +along with GCC; see the file COPYING3. If not see > > +. */ > > +#line 23 "../../gcc/cp/cp-trait.gperf" > > +struct cp_trait { > > + const char *name; > > + enum cp_trait_kind kind; > > + short arity; > > + bool type; > > +}; > > +/* maximum key range =3D 79, duplicates =3D 0 */ > > + > > +class cp_trait_lookup > > +{ > > +private: > > + static inline unsigned int hash (const char *str, size_t len); > > +public: > > + static const struct cp_trait *find (const char *str, size_t len); > > +}; > > + > > +inline unsigned int > > +cp_trait_lookup::hash (const char *str, size_t len) > > +{ > > + static const unsigned char asso_values[] =3D > > + { > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 1, 86, 86, > > + 0, 35, 86, 0, 86, 0, 86, 86, 10, 10, > > + 50, 15, 55, 86, 30, 5, 15, 0, 86, 86, > > + 86, 20, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, > > + 86, 86, 86, 86, 86, 86 > > + }; > > + unsigned int hval =3D len; > > + > > + switch (hval) > > + { > > + default: > > + hval +=3D asso_values[static_cast(str[7])]; > > + /*FALLTHROUGH*/ > > + case 7: > > + break; > > + } > > + return hval; > > +} > > + > > +const struct cp_trait * > > +cp_trait_lookup::find (const char *str, size_t len) > > +{ > > + enum > > + { > > + TOTAL_KEYWORDS =3D 45, > > + MIN_WORD_LENGTH =3D 7, > > + MAX_WORD_LENGTH =3D 37, > > + MIN_HASH_VALUE =3D 7, > > + MAX_HASH_VALUE =3D 85 > > + }; > > + > > + static const struct cp_trait wordlist[] =3D > > + { > > +#line 73 "../../gcc/cp/cp-trait.gperf" > > + {"__bases", CPTK_BASES, 1, true}, > > +#line 56 "../../gcc/cp/cp-trait.gperf" > > + {"__is_pod", CPTK_IS_POD, 1, false}, > > +#line 48 "../../gcc/cp/cp-trait.gperf" > > + {"__is_enum", CPTK_IS_ENUM, 1, false}, > > +#line 64 "../../gcc/cp/cp-trait.gperf" > > + {"__is_union", CPTK_IS_UNION, 1, false}, > > +#line 44 "../../gcc/cp/cp-trait.gperf" > > + {"__is_class", CPTK_IS_CLASS, 1, false}, > > +#line 60 "../../gcc/cp/cp-trait.gperf" > > + {"__is_trivial", CPTK_IS_TRIVIAL, 1, false}, > > +#line 41 "../../gcc/cp/cp-trait.gperf" > > + {"__is_aggregate", CPTK_IS_AGGREGATE, 1, false}, > > +#line 72 "../../gcc/cp/cp-trait.gperf" > > + {"__is_deducible ", CPTK_IS_DEDUCIBLE, 2, false}, > > +#line 43 "../../gcc/cp/cp-trait.gperf" > > + {"__is_base_of", CPTK_IS_BASE_OF, 2, false}, > > +#line 40 "../../gcc/cp/cp-trait.gperf" > > + {"__is_abstract", CPTK_IS_ABSTRACT, 1, false}, > > +#line 58 "../../gcc/cp/cp-trait.gperf" > > + {"__is_same", CPTK_IS_SAME, 2, false}, > > +#line 42 "../../gcc/cp/cp-trait.gperf" > > + {"__is_assignable", CPTK_IS_ASSIGNABLE, 2, false}, > > +#line 59 "../../gcc/cp/cp-trait.gperf" > > + {"__is_standard_layout", CPTK_IS_STD_LAYOUT, 1, false}, > > +#line 30 "../../gcc/cp/cp-trait.gperf" > > + {"__is_same_as", CPTK_IS_SAME, 2, false}, > > +#line 63 "../../gcc/cp/cp-trait.gperf" > > + {"__is_trivially_copyable", CPTK_IS_TRIVIALLY_COPYABLE, 1, false= }, > > +#line 39 "../../gcc/cp/cp-trait.gperf" > > + {"__has_virtual_destructor", CPTK_HAS_VIRTUAL_DESTRUCTOR, 1, fal= se}, > > +#line 61 "../../gcc/cp/cp-trait.gperf" > > + {"__is_trivially_assignable", CPTK_IS_TRIVIALLY_ASSIGNABLE, 2, f= alse}, > > +#line 57 "../../gcc/cp/cp-trait.gperf" > > + {"__is_polymorphic", CPTK_IS_POLYMORPHIC, 1, false}, > > +#line 71 "../../gcc/cp/cp-trait.gperf" > > + {"__underlying_type", CPTK_UNDERLYING_TYPE, 1, true}, > > +#line 62 "../../gcc/cp/cp-trait.gperf" > > + {"__is_trivially_constructible", CPTK_IS_TRIVIALLY_CONSTRUCTIBLE= , -1, false}, > > +#line 74 "../../gcc/cp/cp-trait.gperf" > > + {"__direct_bases", CPTK_DIRECT_BASES, 1, true}, > > +#line 51 "../../gcc/cp/cp-trait.gperf" > > + {"__is_literal_type", CPTK_IS_LITERAL_TYPE, 1, false}, > > +#line 33 "../../gcc/cp/cp-trait.gperf" > > + {"__has_nothrow_copy", CPTK_HAS_NOTHROW_COPY, 1, false}, > > +#line 31 "../../gcc/cp/cp-trait.gperf" > > + {"__has_nothrow_assign", CPTK_HAS_NOTHROW_ASSIGN, 1, false}, > > +#line 55 "../../gcc/cp/cp-trait.gperf" > > + {"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERC= ONVERTIBLE_BASE_OF, 2, false}, > > +#line 52 "../../gcc/cp/cp-trait.gperf" > > + {"__is_nothrow_assignable", CPTK_IS_NOTHROW_ASSIGNABLE, 2, false= }, > > +#line 54 "../../gcc/cp/cp-trait.gperf" > > + {"__is_nothrow_convertible", CPTK_IS_NOTHROW_CONVERTIBLE, 2, fal= se}, > > +#line 32 "../../gcc/cp/cp-trait.gperf" > > + {"__has_nothrow_constructor", CPTK_HAS_NOTHROW_CONSTRUCTOR, 1, f= alse}, > > +#line 53 "../../gcc/cp/cp-trait.gperf" > > + {"__is_nothrow_constructible", CPTK_IS_NOTHROW_CONSTRUCTIBLE, -1= , false}, > > +#line 50 "../../gcc/cp/cp-trait.gperf" > > + {"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, 2, false}, > > +#line 67 "../../gcc/cp/cp-trait.gperf" > > + {"__remove_cv", CPTK_REMOVE_CV, 1, true}, > > +#line 36 "../../gcc/cp/cp-trait.gperf" > > + {"__has_trivial_copy", CPTK_HAS_TRIVIAL_COPY, 1, false}, > > +#line 68 "../../gcc/cp/cp-trait.gperf" > > + {"__remove_cvref", CPTK_REMOVE_CVREF, 1, true}, > > +#line 34 "../../gcc/cp/cp-trait.gperf" > > + {"__has_trivial_assign", CPTK_HAS_TRIVIAL_ASSIGN, 1, false}, > > +#line 69 "../../gcc/cp/cp-trait.gperf" > > + {"__remove_reference", CPTK_REMOVE_REFERENCE, 1, true}, > > +#line 37 "../../gcc/cp/cp-trait.gperf" > > + {"__has_trivial_destructor", CPTK_HAS_TRIVIAL_DESTRUCTOR, 1, fal= se}, > > +#line 35 "../../gcc/cp/cp-trait.gperf" > > + {"__has_trivial_constructor", CPTK_HAS_TRIVIAL_CONSTRUCTOR, 1, f= alse}, > > +#line 49 "../../gcc/cp/cp-trait.gperf" > > + {"__is_final", CPTK_IS_FINAL, 1, false}, > > +#line 47 "../../gcc/cp/cp-trait.gperf" > > + {"__is_empty", CPTK_IS_EMPTY, 1, false}, > > +#line 46 "../../gcc/cp/cp-trait.gperf" > > + {"__is_convertible", CPTK_IS_CONVERTIBLE, 2, false}, > > +#line 45 "../../gcc/cp/cp-trait.gperf" > > + {"__is_constructible", CPTK_IS_CONSTRUCTIBLE, -1, false}, > > +#line 66 "../../gcc/cp/cp-trait.gperf" > > + {"__reference_converts_from_temporary", CPTK_REF_CONVERTS_FROM_T= EMPORARY, 2, false}, > > +#line 65 "../../gcc/cp/cp-trait.gperf" > > + {"__reference_constructs_from_temporary", CPTK_REF_CONSTRUCTS_FR= OM_TEMPORARY, 2, false}, > > +#line 70 "../../gcc/cp/cp-trait.gperf" > > + {"__type_pack_element", CPTK_TYPE_PACK_ELEMENT, -1, true}, > > +#line 38 "../../gcc/cp/cp-trait.gperf" > > + {"__has_unique_object_representations", CPTK_HAS_UNIQUE_OBJ_REPR= ESENTATIONS, 1, false} > > + }; > > + > > + static const signed char lookup[] =3D > > + { > > + -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, -1, > > + 6, 7, -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, > > + 19, 20, -1, -1, 21, 22, -1, 23, -1, 24, 25, 26, 27, 28, > > + 29, -1, -1, -1, 30, -1, 31, 32, 33, -1, -1, 34, 35, 36, > > + -1, -1, -1, -1, 37, -1, -1, -1, -1, 38, 39, -1, 40, -1, > > + 41, -1, 42, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, > > + -1, 44 > > + }; > > + > > + if (len <=3D MAX_WORD_LENGTH && len >=3D MIN_WORD_LENGTH) > > + { > > + unsigned int key =3D hash (str, len); > > + > > + if (key <=3D MAX_HASH_VALUE) > > + { > > + int index =3D lookup[key]; > > + > > + if (index >=3D 0) > > + { > > + const char *s =3D wordlist[index].name; > > + > > + if (*str =3D=3D *s && !strcmp (str + 1, s + 1)) > > + return &wordlist[index]; > > + } > > + } > > + } > > + return 0; > > +} > > diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc > > index f3abae716fe..432c43400ab 100644 > > --- a/gcc/cp/parser.cc > > +++ b/gcc/cp/parser.cc > > @@ -49,6 +49,7 @@ along with GCC; see the file COPYING3. If not see > > #include "contracts.h" > > #include "bitmap.h" > > #include "builtins.h" > > +#include "cp-trait.h" > > > > > > /* The lexer. */ > > @@ -1165,12 +1166,8 @@ cp_keyword_starts_decl_specifier_p (enum rid key= word) > > /* C++20 extensions. */ > > case RID_CONSTINIT: > > case RID_CONSTEVAL: > > - return true; > > - > > -#define DEFTRAIT_TYPE(CODE, NAME, ARITY) \ > > - case RID_##CODE: > > -#include "cp-trait.def" > > -#undef DEFTRAIT_TYPE > > + /* C++ type-yielding built-in traits, defined in cp-trait.def. = */ > > + case RID_TRAIT_TYPE: > > return true; > > > > default: > > @@ -2854,7 +2851,7 @@ static void cp_parser_late_parsing_default_args > > static tree cp_parser_sizeof_operand > > (cp_parser *, enum rid); > > static cp_expr cp_parser_trait > > - (cp_parser *, enum rid); > > + (cp_parser *, tree); > > static bool cp_parser_declares_only_class_p > > (cp_parser *); > > static void cp_parser_set_storage_class > > @@ -6021,11 +6018,8 @@ cp_parser_primary_expression (cp_parser *parser, > > case RID_OFFSETOF: > > return cp_parser_builtin_offsetof (parser); > > > > -#define DEFTRAIT_EXPR(CODE, NAME, ARITY) \ > > - case RID_##CODE: > > -#include "cp-trait.def" > > -#undef DEFTRAIT_EXPR > > - return cp_parser_trait (parser, token->keyword); > > + case RID_TRAIT_EXPR: > > + return cp_parser_trait (parser, token->u.value); > > > > // C++ concepts > > case RID_REQUIRES: > > @@ -11033,28 +11027,15 @@ cp_parser_builtin_offsetof (cp_parser *parser= ) > > /* Parse a builtin trait expression or type. */ > > > > static cp_expr > > -cp_parser_trait (cp_parser* parser, enum rid keyword) > > +cp_parser_trait (cp_parser* parser, tree keyword) > > { > > - cp_trait_kind kind; > > - tree type1, type2 =3D NULL_TREE; > > - bool binary =3D false; > > - bool variadic =3D false; > > - bool type =3D false; > > + const char* keyword_str =3D IDENTIFIER_POINTER (keyword); > > + int keyword_len =3D IDENTIFIER_LENGTH (keyword); > > + const cp_trait* trait =3D cp_trait_lookup::find (keyword_str, keywor= d_len); > > > > - switch (keyword) > > - { > > -#define DEFTRAIT(TCC, CODE, NAME, ARITY) \ > > - case RID_##CODE: \ > > - kind =3D CPTK_##CODE; \ > > - binary =3D (ARITY =3D=3D 2); \ > > - variadic =3D (ARITY =3D=3D -1); \ > > - type =3D (TCC =3D=3D tcc_type); \ > > - break; > > -#include "cp-trait.def" > > -#undef DEFTRAIT > > - default: > > - gcc_unreachable (); > > - } > > + tree type1, type2 =3D NULL_TREE; > > + bool binary =3D (trait->arity =3D=3D 2); > > + bool variadic =3D (trait->arity =3D=3D -1); > > > > /* Get location of initial token. */ > > location_t start_loc =3D cp_lexer_peek_token (parser->lexer)->locati= on; > > @@ -11063,12 +11044,12 @@ cp_parser_trait (cp_parser* parser, enum rid = keyword) > > cp_lexer_consume_token (parser->lexer); > > > > matching_parens parens; > > - if (kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > + if (trait->kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > cp_parser_require (parser, CPP_LESS, RT_LESS); > > else > > parens.require_open (parser); > > > > - if (kind =3D=3D CPTK_IS_DEDUCIBLE) > > + if (trait->kind =3D=3D CPTK_IS_DEDUCIBLE) > > { > > const cp_token* token =3D cp_lexer_peek_token (parser->lexer); > > type1 =3D cp_parser_id_expression (parser, > > @@ -11079,7 +11060,7 @@ cp_parser_trait (cp_parser* parser, enum rid ke= yword) > > /*optional_p=3D*/false); > > type1 =3D cp_parser_lookup_name_simple (parser, type1, token->lo= cation); > > } > > - else if (kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > + else if (trait->kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > /* __type_pack_element takes an expression as its first argument a= nd uses > > template-id syntax instead of function call syntax (for consist= ency > > with Clang). We special case these properties of __type_pack_e= lement > > @@ -11094,7 +11075,7 @@ cp_parser_trait (cp_parser* parser, enum rid ke= yword) > > if (type1 =3D=3D error_mark_node) > > return error_mark_node; > > > > - if (kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > + if (trait->kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > { > > cp_parser_require (parser, CPP_COMMA, RT_COMMA); > > tree trailing =3D cp_parser_enclosed_template_argument_list (par= ser); > > @@ -11144,7 +11125,7 @@ cp_parser_trait (cp_parser* parser, enum rid ke= yword) > > } > > > > location_t finish_loc =3D cp_lexer_peek_token (parser->lexer)->locat= ion; > > - if (kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > + if (trait->kind =3D=3D CPTK_TYPE_PACK_ELEMENT) > > /* cp_parser_enclosed_template_argument_list above already took ca= re > > of parsing the closing '>'. */; > > else > > @@ -11158,17 +11139,17 @@ cp_parser_trait (cp_parser* parser, enum rid = keyword) > > > > /* Complete the trait expression, which may mean either processing > > the trait expr now or saving it for template instantiation. */ > > - switch (kind) > > + switch (trait->kind) > > { > > case CPTK_BASES: > > return cp_expr (finish_bases (type1, false), trait_loc); > > case CPTK_DIRECT_BASES: > > return cp_expr (finish_bases (type1, true), trait_loc); > > default: > > - if (type) > > - return finish_trait_type (kind, type1, type2, tf_warning_or_error= ); > > + if (trait->type) > > + return finish_trait_type (trait->kind, type1, type2, tf_warning_o= r_error); > > else > > - return finish_trait_expr (trait_loc, kind, type1, type2); > > + return finish_trait_expr (trait_loc, trait->kind, type1, type2); > > } > > } > > > > @@ -20081,11 +20062,8 @@ cp_parser_simple_type_specifier (cp_parser* pa= rser, > > > > return type; > > > > -#define DEFTRAIT_TYPE(CODE, NAME, ARITY) \ > > - case RID_##CODE: > > -#include "cp-trait.def" > > -#undef DEFTRAIT_TYPE > > - type =3D cp_parser_trait (parser, token->keyword); > > + case RID_TRAIT_TYPE: > > + type =3D cp_parser_trait (parser, token->u.value); > > if (decl_specs) > > cp_parser_set_decl_spec_type (decl_specs, type, > > token, > > -- > > 2.42.0 > > > > >