From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6AEC33858435 for ; Tue, 30 Apr 2024 21:08:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6AEC33858435 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6AEC33858435 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714511317; cv=none; b=MWNNLblx4p1NEoE/E0cPBJXppTRkWMj3rFXO+7OOLaVaGUXX4KzRhWEPQxfdjWZoMjJshcgIuZBptzBKRB5tyxXZk3YXVqI9JDeS4eVcOeZf5ZAMDgjvpSvKf4v3RNXkk/EDTIkY+Mb5OIzVE+OwxaD47nEbIOna5fkpabk9MNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714511317; c=relaxed/simple; bh=gejXZQYQtjEsb4sgsAw2aXpsXV+ULvMuSD6sM5K/bus=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=Q8QfnBne2fluBqNsWFBnCHp5pr2lPjKfPdD6KohxxYsxqFLzPkiWxVDIAvQx6RrascTTOz2lqboadK8Js/bwfwQY2qAG8rt0vthtAUwSMziN3dDBZRF6LNm3Sv2S+72nFzU3p+RilHsYisuTRVQex9FePHrcO8RFijMG/BXudWI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714511315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XYrsjKjQyaPJboMdXmkV4VJ1wHGPqfGwKmu5QfeulfI=; b=EuPB2KS+DuxIEukWAeYIntH+BP+qT9f8DEZo00XbIhaqGLO+syNYLkyluDElnEiNHDqTqU qTerLFMx1psmZADlJvrQLCgzcMmMBPuY9FDvRLcOVsvEfIFURBtSoZsJWHfnjHcOt7hmjD tg9EBv1QJRXXCwfyzt2pGT2gVYnLs7Y= Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-N4e539-9OnaIKq4pG_2U7Q-1; Tue, 30 Apr 2024 17:08:33 -0400 X-MC-Unique: N4e539-9OnaIKq4pG_2U7Q-1 Received: by mail-ot1-f70.google.com with SMTP id 46e09a7af769-6ee11ae73faso4359217a34.3 for ; Tue, 30 Apr 2024 14:08:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714511312; x=1715116112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XYrsjKjQyaPJboMdXmkV4VJ1wHGPqfGwKmu5QfeulfI=; b=rlzlTSJaY2hixM8neLH8lACcmcUyEB+/JikaCCbAkEbzZoywHJOd5sVG34z8lt+d5i UWO4V2qDxnz0egIFdJ7ake1jXbOHkik7MTu4KKtp7EHoixJsANAVjI9F5pgD/seDQ/ak abjo4GwlOvDfci3FCihnPl2oqhv57Tr8byxQmuP27WZl5GBrGrIp8MMkk6FFDdN6lVq6 itPFxfeiDWTyMp9MuknSVa9swgiUKG7rQN0Vfl8BwsMqL+UDI92L5/hqXtGny0Lq0ing ekKp3R7EaW11UzKUrVjfAgWYX04eRJNzimXyUaLdXFbE3HRm7jZGysqbtcKIpNUfCZoO zkHQ== X-Gm-Message-State: AOJu0Yw6C7l0UEAJVjPXN0bkAob39fbm8azuw+eUzZY37j969cU89JMH /d5GBGJg4y6HXvbCbGaa3GZsaUeiSPp8hEVaDMuSAxXfOX7xWiPC6SMAxcz4OsiwdFGd5mLp+tp Ze/7iFoaw5NUYieM1rLtnyHEDYMv+SIaJerrEKDD7mDr4NiNDOdVE X-Received: by 2002:a9d:6343:0:b0:6eb:a637:97aa with SMTP id y3-20020a9d6343000000b006eba63797aamr658191otk.21.1714511312482; Tue, 30 Apr 2024 14:08:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAEQ7km6GYmjsYfFtxMbypS4kGP8dmCwztqlonbBAZs7VQ+zgD9McMR1MCrnS9pW8WAUyMYQ== X-Received: by 2002:a9d:6343:0:b0:6eb:a637:97aa with SMTP id y3-20020a9d6343000000b006eba63797aamr658170otk.21.1714511312164; Tue, 30 Apr 2024 14:08:32 -0700 (PDT) Received: from [192.168.1.130] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id h30-20020a05620a21de00b0078d667d1085sm10033489qka.84.2024.04.30.14.08.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Apr 2024 14:08:31 -0700 (PDT) Message-ID: <8b32b64d-8411-4792-9ffc-b81dbc189e52@redhat.com> Date: Tue, 30 Apr 2024 17:08:30 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v14 21/26] c++: Implement __rank built-in trait To: Ken Matsui , gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org References: <20240221093616.4001742-1-kmatsui@gcc.gnu.org> <20240228192843.188979-1-kmatsui@gcc.gnu.org> <20240228192843.188979-22-kmatsui@gcc.gnu.org> From: Jason Merrill In-Reply-To: <20240228192843.188979-22-kmatsui@gcc.gnu.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,SPF_HELO_NONE,SPF_NONE,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 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? > 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 temporary " > "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_from_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 type1, 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_kind kind, tree type1, tree type2) > if (processing_template_decl) > { > tree trait_expr = make_node (TRAIT_EXPR); > - TREE_TYPE (trait_expr) = boolean_type_node; > + if (kind == CPTK_RANK) > + TREE_TYPE (trait_expr) = size_type_node; > + else > + TREE_TYPE (trait_expr) = boolean_type_node; > TRAIT_EXPR_TYPE1 (trait_expr) = type1; > TRAIT_EXPR_TYPE2 (trait_expr) = type2; > TRAIT_EXPR_KIND (trait_expr) = kind; > @@ -12714,6 +12720,7 @@ finish_trait_expr (location_t loc, cp_trait_kind 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_kind kind, tree type1, tree type2) > gcc_unreachable (); > } > > - tree val = (trait_expr_value (kind, type1, type2) > - ? boolean_true_node : boolean_false_node); > + tree val; > + if (kind == CPTK_RANK) > + { > + size_t rank = 0; > + for (; TREE_CODE (type1) == ARRAY_TYPE; type1 = TREE_TYPE (type1)) > + ++rank; > + val = build_int_cst (size_type_node, rank); > + } > + else > + val = (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) == 0); > +SA(__rank(int[2]) == 1); > +SA(__rank(int[][4]) == 2); > +SA(__rank(int[2][2][4][4][6][6]) == 6); > +SA(__rank(ClassType) == 0); > +SA(__rank(ClassType[2]) == 1); > +SA(__rank(ClassType[][4]) == 2); > +SA(__rank(ClassType[2][2][4][4][6][6]) == 6); > + > +template void f(T) = delete; > +void f(size_t); > + > +template > +void g() { f(__rank(T)); } > + > +template void g();