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 A33003858D34 for ; Thu, 2 May 2024 15:15:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A33003858D34 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 A33003858D34 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=1714662958; cv=none; b=rMbk++zjGcEkxL6gS+rnA0E/Z638TYSjDrSQDlwSFV9Xrf8pcDHA4eAP+8tjGhovGuhygbgXjMymPJsv9Tc5xp4bukSA97Q2nat2dnj2NivPqw8L5TzuEpbBlt/92UURYeUTfgykraGg/IdZsfBflj8EHJI17NhkBHUxKu41bt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714662958; c=relaxed/simple; bh=erbVpcvBYK2ohLB2bwcdaWF2hLpXASbCqLOreBEwRl4=; h=DKIM-Signature:From:Date:To:Subject:Message-ID:MIME-Version; b=aGS3CT90OUFcw7/quN2GSwStWQ7e0sCsFsm8uzDGr9Xwqz1OkD4Fa6Y1IINZh6Mtx0SoA42iDomnyUTQAJaPPtFn+DxS5hW87YKEAKQ5rOXTNcfjNkQwoRjTQKUlp/duG399PQKTwHBVpeuR0BR7JMx0CLkWvlv7k+L8yLb1JUg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714662956; 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: in-reply-to:in-reply-to:references:references; bh=oi99PjDQ/HVkSleKvK0Ldt26rj1DTYb7ZgVbTnp3Fzs=; b=a9Ogr3of8T5D5b0ZcQL8nmaScYXZDpmYmHVh0wcmTPV1WvmNWrKzXg4RF0GMh++Neql8ro EieT8AHMez69tBZkEdrMEcmRFR3665JQ5aRrfrR/POYdcj3qdlmAHe6+HtMPVMrGO79u6Q AMxVjbbhEVVebMG0ullXGmyA1KeDIsI= Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-EdId57cYNJeSclXsYTDGKg-1; Thu, 02 May 2024 11:15:54 -0400 X-MC-Unique: EdId57cYNJeSclXsYTDGKg-1 Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-3c70e71ee15so10797973b6e.1 for ; Thu, 02 May 2024 08:15:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714662954; x=1715267754; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oi99PjDQ/HVkSleKvK0Ldt26rj1DTYb7ZgVbTnp3Fzs=; b=krIU1Lrxeokt+lXXI9zhZzLCGrd4C3IyEHLre8fPcIqfh3dV/IntVvsNxDOWWblQJu 6DqYS/QSVL98M4IKk4TDgS3HtZHmNM3B0ov4D6xC/k85c/DG97JJLRUkx1jCwxi1ZzOf x2EPk/Omi1ct+OUMaxQwzSCZoSYYMsXxUXXDZW//kcJl3yhg0x+uw2qRxBv4Dxzz5NCu XVy7X+fdiIYM+xIv1uKNjhC5pXzIjgVlTVRMRRnk8dBwdKkd+YgSxJwHUXEqupNj5oPD VAQuYfwT6REmOULVkWmf5bdQSDRER77DarxbC0kWN8WhYFlPXeBbjQtvjo/zyTKnH0V2 SQSw== X-Forwarded-Encrypted: i=1; AJvYcCVB8JAt1nw78c5yhFxKAg6tQYUxhrjx5I9F7/HDRhg83yXTP+MjryutaStW+NOa9vK5Ig5rIdjMHgMrOgzA8IQWjIFUqRc= X-Gm-Message-State: AOJu0Yzpj1IeYvAX9ahRdsTAhjK8afSWeU02w74TXPQtHporx1MOW79U nygN+gMII/o+fB8yEIJ08pV0AywOQltdFBB5C6lz/Kd9XRmTeubjExqoS0Br129Att7RElL4oVG nVYA2qbLReWArQS2il91M3atW14gc+aH41gM7ncZlUVoUPEadiJ93 X-Received: by 2002:a05:6808:c6:b0:3c7:4e35:7e22 with SMTP id t6-20020a05680800c600b003c74e357e22mr153031oic.1.1714662953715; Thu, 02 May 2024 08:15:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFw2h9PM0zzSTzgTVNunoy1lq3vXnPUglAWUTr3x+r/B3VGGecATTrdmWMOaooVo009m08cEA== X-Received: by 2002:a05:6808:c6:b0:3c7:4e35:7e22 with SMTP id t6-20020a05680800c600b003c74e357e22mr153002oic.1.1714662953343; Thu, 02 May 2024 08:15:53 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id mm21-20020a0562145e9500b006a0f3704be0sm424304qvb.49.2024.05.02.08.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 08:15:52 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Thu, 2 May 2024 11:15:51 -0400 (EDT) To: Jason Merrill cc: Ken Matsui , gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [PATCH v14 21/26] c++: Implement __rank built-in trait In-Reply-To: <8b32b64d-8411-4792-9ffc-b81dbc189e52@redhat.com> Message-ID: 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-14.2 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 Tue, 30 Apr 2024, Jason Merrill wrote: > 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? Clang already implements many of these built-in, without using "__builtin" in their name. Shouldn't we be consistent with Clang where we can? > > > 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(); > >