From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 4F0F43858D34 for ; Thu, 2 May 2024 15:01:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F0F43858D34 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 ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4F0F43858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::32c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714662091; cv=none; b=pzHujYZ1I+1Unewt+SeUPTd28021cbDdXm65kbQKfNilGI3FbhdGIkH512d8AnYNhStNzSdr6TbJ3FkCVMoDtlr0Rb4wRfiRI7PDFFYUrhOaiDmCC6qTAKmxKZSi1u+UoNYtJPUvbMFXtWbasKPoo9rcgnLpKsuiHkV8QbGH7bY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714662091; c=relaxed/simple; bh=/aoUShR9MXpg24eFqZJ6cJIncghj7ejpmy275pl2XHo=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=UBFC32i1ECBZZurtaGnRmkdiq85DG46rIpr8az3kYRU04bnsuuC6oTR6IA5d2Fjw7cnX4x91NYrdBO8ZolRN13GwrjAcR/fJtAsDHJNvZxQte0KWDAk3derR3STCp6u6uVjN3iPFHghfaD+4Jsw9jcs1b/wHt+grSV2hR7HtTcg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6ee2d64423cso3031696a34.2 for ; Thu, 02 May 2024 08:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1714662087; x=1715266887; 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=F46np02ICGZDrrCZ2kozwp7ZwvcOE7Cr1QmbFNnIGQM=; b=TWMI5MRBkPGBBqvsRGwytgX0Lmt1C64Fr0PfGFrIiNnsAFtd7t5Y9t4rtDyvJRy5AN duztydsqoguwvBmcUseltOuYZcZ6G8bmAoy2ya/+lbmSWJ+UGCNpCtVi53bTEbM3XU7v 6TJTBUIn+u2MLqGipTqWl2N8FBr4cd2AjS+oE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714662087; x=1715266887; 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=F46np02ICGZDrrCZ2kozwp7ZwvcOE7Cr1QmbFNnIGQM=; b=jEuNmp0pjbWjxblJWXbX3ng2dexwtgWZxMxx0iIrZj3tpeguOgh4Mqa9lpIYilYx4g ExENUIIq8vFWsJm1tHgBVA8QQBc9jg0CvzWdrLJQeXjM0UnaYoooly6LWv580sOMxuO7 Fp1YqglFL5CMoGUAPviP5vJ/NwwANTRsFnoCsEII4Ou9H1GHoFN1CdL1IwZqyV/SU8il 6qbrBVcKt7FnJi4ilo6TjXmyEENb3rQoCUfbhHH7OL0WgVVZhK2bJbsMgaozF0EBTRqd KTJgVUawV1D0xpiQu3hUJ4gPr3qrY3+iMN9YeOlSg9TfAldC8pJWkJ4/SSJwFsJ0IWpr 2phQ== X-Forwarded-Encrypted: i=1; AJvYcCUQrGKhePNWueQAmF4RABJYnP1Lxxk7Q4cy6vDGGzSU+9/Hjq4yP3mA1EJv71X8onsAymcTB/V/8FYct1TQopr/TPQKL4A= X-Gm-Message-State: AOJu0YxDX/CPn6pJher2CXQsRSo/RTJc4Gf3tSXCKr4hpiE81/vWCcoE fN0b7/UFCcKs2YACGdYTtRDsxUwrME63F3K95g9D3TGDTRFENONzAF2Jnnw33/g9z9aWGFiSPsp kMyHDM0N88Xdhpk5d7bGaYCFxdzaXak1dWGmu X-Google-Smtp-Source: AGHT+IG7ogIb1lzQMQzNvh3cWRnQHPSLVVxiX0Hbn/TYHAQThJMBbQ7Aqbmswl45f6RNQ+OitdB5OwSsoZZQOaQ2cM0= X-Received: by 2002:a9d:7614:0:b0:6ed:87e4:8ec1 with SMTP id k20-20020a9d7614000000b006ed87e48ec1mr72024otl.24.1714662087441; Thu, 02 May 2024 08:01:27 -0700 (PDT) MIME-Version: 1.0 References: <20240221093616.4001742-1-kmatsui@gcc.gnu.org> <20240228192843.188979-1-kmatsui@gcc.gnu.org> <20240228192843.188979-22-kmatsui@gcc.gnu.org> <8b32b64d-8411-4792-9ffc-b81dbc189e52@redhat.com> In-Reply-To: <8b32b64d-8411-4792-9ffc-b81dbc189e52@redhat.com> From: Ken Matsui Date: Thu, 2 May 2024 08:00:00 -0700 Message-ID: Subject: Re: [PATCH v14 21/26] c++: Implement __rank built-in trait To: Jason Merrill Cc: Ken Matsui , gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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 Tue, Apr 30, 2024 at 2:08=E2=80=AFPM Jason Merrill wr= ote: > > On 2/28/24 11:26, Ken Matsui wrote: > > This patch implements built-in trait for std::rank. > > __rank seems too short, maybe __array_rank? > > Actually, it occurs to me that perhaps we should have been adding > __builtin to all of these rather than just __ and the library trait > name. I guess it's too late to do that for the GCC 14 traits, but we > could do it for this group? Let me add __builtin. I think it would be better to add __builtin for all existing traits for consistency, but is there any reason we want to avoid that? > > > gcc/cp/ChangeLog: > > > > * cp-trait.def: Define __rank. > > * constraint.cc (diagnose_trait_expr): Handle CPTK_RANK. > > * semantics.cc (trait_expr_value): Likewise. > > (finish_trait_expr): Likewise. > > > > gcc/testsuite/ChangeLog: > > > > * g++.dg/ext/has-builtin-1.C: Test existence of __rank. > > * g++.dg/ext/rank.C: New test. > > > > Signed-off-by: Ken Matsui > > --- > > gcc/cp/constraint.cc | 3 +++ > > gcc/cp/cp-trait.def | 1 + > > gcc/cp/semantics.cc | 23 ++++++++++++++++++++--- > > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 +++ > > gcc/testsuite/g++.dg/ext/rank.C | 24 +++++++++++++++++++++++= + > > 5 files changed, 51 insertions(+), 3 deletions(-) > > create mode 100644 gcc/testsuite/g++.dg/ext/rank.C > > > > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc > > index 000df847342..23ea66d9c12 100644 > > --- a/gcc/cp/constraint.cc > > +++ b/gcc/cp/constraint.cc > > @@ -3870,6 +3870,9 @@ diagnose_trait_expr (tree expr, tree args) > > case CPTK_IS_VOLATILE: > > inform (loc, " %qT is not a volatile type", t1); > > break; > > + case CPTK_RANK: > > + inform (loc, " %qT cannot yield a rank", t1); > > + break; > > case CPTK_REF_CONSTRUCTS_FROM_TEMPORARY: > > inform (loc, " %qT is not a reference that binds to a temporar= y " > > "object of type %qT (direct-initialization)", t1, t2); > > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def > > index 2d1cb7c227c..85056c8140b 100644 > > --- a/gcc/cp/cp-trait.def > > +++ b/gcc/cp/cp-trait.def > > @@ -99,6 +99,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially= _copyable", 1) > > DEFTRAIT_EXPR (IS_UNBOUNDED_ARRAY, "__is_unbounded_array", 1) > > DEFTRAIT_EXPR (IS_UNION, "__is_union", 1) > > DEFTRAIT_EXPR (IS_VOLATILE, "__is_volatile", 1) > > +DEFTRAIT_EXPR (RANK, "__rank", 1) > > DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs= _from_temporary", 2) > > DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_fro= m_temporary", 2) > > DEFTRAIT_TYPE (REMOVE_ALL_EXTENTS, "__remove_all_extents", 1) > > diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc > > index 45dc509855a..7242db75248 100644 > > --- a/gcc/cp/semantics.cc > > +++ b/gcc/cp/semantics.cc > > @@ -12550,6 +12550,9 @@ trait_expr_value (cp_trait_kind kind, tree type= 1, tree type2) > > case CPTK_IS_DEDUCIBLE: > > return type_targs_deducible_from (type1, type2); > > > > + /* __rank is handled in finish_trait_expr. */ > > + case CPTK_RANK: > > This should have a gcc_unreachable. > > > + > > #define DEFTRAIT_TYPE(CODE, NAME, ARITY) \ > > case CPTK_##CODE: > > #include "cp-trait.def" > > @@ -12622,7 +12625,10 @@ finish_trait_expr (location_t loc, cp_trait_ki= nd kind, tree type1, tree type2) > > if (processing_template_decl) > > { > > tree trait_expr =3D make_node (TRAIT_EXPR); > > - TREE_TYPE (trait_expr) =3D boolean_type_node; > > + if (kind =3D=3D CPTK_RANK) > > + TREE_TYPE (trait_expr) =3D size_type_node; > > + else > > + TREE_TYPE (trait_expr) =3D boolean_type_node; > > TRAIT_EXPR_TYPE1 (trait_expr) =3D type1; > > TRAIT_EXPR_TYPE2 (trait_expr) =3D type2; > > TRAIT_EXPR_KIND (trait_expr) =3D kind; > > @@ -12714,6 +12720,7 @@ finish_trait_expr (location_t loc, cp_trait_kin= d kind, tree type1, tree type2) > > case CPTK_IS_UNBOUNDED_ARRAY: > > case CPTK_IS_UNION: > > case CPTK_IS_VOLATILE: > > + case CPTK_RANK: > > break; > > > > case CPTK_IS_LAYOUT_COMPATIBLE: > > @@ -12745,8 +12752,18 @@ finish_trait_expr (location_t loc, cp_trait_ki= nd kind, tree type1, tree type2) > > gcc_unreachable (); > > } > > > > - tree val =3D (trait_expr_value (kind, type1, type2) > > - ? boolean_true_node : boolean_false_node); > > + tree val; > > + if (kind =3D=3D CPTK_RANK) > > + { > > + size_t rank =3D 0; > > + for (; TREE_CODE (type1) =3D=3D ARRAY_TYPE; type1 =3D TREE_TYPE = (type1)) > > + ++rank; > > + val =3D build_int_cst (size_type_node, rank); > > + } > > + else > > + val =3D (trait_expr_value (kind, type1, type2) > > + ? boolean_true_node : boolean_false_node); > > + > > return maybe_wrap_with_location (val, loc); > > } > > > > diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g= ++.dg/ext/has-builtin-1.C > > index 3aca273aad6..7f7b27f7aa7 100644 > > --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C > > +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C > > @@ -179,6 +179,9 @@ > > #if !__has_builtin (__is_volatile) > > # error "__has_builtin (__is_volatile) failed" > > #endif > > +#if !__has_builtin (__rank) > > +# error "__has_builtin (__rank) failed" > > +#endif > > #if !__has_builtin (__reference_constructs_from_temporary) > > # error "__has_builtin (__reference_constructs_from_temporary) failed= " > > #endif > > diff --git a/gcc/testsuite/g++.dg/ext/rank.C b/gcc/testsuite/g++.dg/ext= /rank.C > > new file mode 100644 > > index 00000000000..28894184387 > > --- /dev/null > > +++ b/gcc/testsuite/g++.dg/ext/rank.C > > @@ -0,0 +1,24 @@ > > +// { dg-do compile { target c++11 } } > > + > > +#include > > + > > +#define SA(X) static_assert((X),#X) > > + > > +class ClassType { }; > > + > > +SA(__rank(int) =3D=3D 0); > > +SA(__rank(int[2]) =3D=3D 1); > > +SA(__rank(int[][4]) =3D=3D 2); > > +SA(__rank(int[2][2][4][4][6][6]) =3D=3D 6); > > +SA(__rank(ClassType) =3D=3D 0); > > +SA(__rank(ClassType[2]) =3D=3D 1); > > +SA(__rank(ClassType[][4]) =3D=3D 2); > > +SA(__rank(ClassType[2][2][4][4][6][6]) =3D=3D 6); > > + > > +template void f(T) =3D delete; > > +void f(size_t); > > + > > +template > > +void g() { f(__rank(T)); } > > + > > +template void g(); >