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 656C33857B88 for ; Thu, 15 Feb 2024 21:48:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 656C33857B88 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 656C33857B88 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=1708033721; cv=none; b=R62UMhBGGy7pflLc0LjSjkqfYMMlwxBWVGPkEvoi4SQEqZBnHbG+J9jf9Xx4w3AdHPmbIr3UfFFiw/11SMjuoKX6yFsSTmo6w5jZvDYOlkwt5gGNwiz/SMm7Y1uowJyoOGeVxv76MXRXpGvv2bgdsWuezGJnP9yeUM5bBO1g5IY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708033721; c=relaxed/simple; bh=qhQfsn6yL9zrA8acAAgk/FrP3ie75tJ25HsZTdyHHtE=; h=DKIM-Signature:From:Date:To:Subject:Message-ID:MIME-Version; b=mCML5ychAI/gulgLuHFBTU9yj59X58lugrZ7PL5hF/SXbrNud9lwH380E9kvjFTVyyG2wIeeuFvg8ibi3ThLSAtqC2xFI4hmpj4YJVP5ImmSWMOkGa93S1hICyChCnnsFly2mR+HOV+Qtu54dN7z7vRqZgmVHIJ+ok29Rn5S70s= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708033719; 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=rl99usryAHjJyJsnuei42Q5IX6TDrrqhoT/kzxRUy/s=; b=EBBR7PkMMywC1dDNm7XHYSIp7GjWi41CA32OHsgp9d5gfPkIURKwJtsjKiv3WRcOQwipkQ KCTfM6ZkliveZqjRFS3J9NTbc+Gsg6CTGLQv0oCP6DqSGC8ZKJmAaS9JnJ2OW4CozHSVob aRxFljBcjeIo+ZvQ2MebJ1qNxQ9IZzM= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-vVXKRWtHPKyKDshpPLqukg-1; Thu, 15 Feb 2024 16:48:37 -0500 X-MC-Unique: vVXKRWtHPKyKDshpPLqukg-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7873fd60a11so26581885a.1 for ; Thu, 15 Feb 2024 13:48:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708033717; x=1708638517; 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=rl99usryAHjJyJsnuei42Q5IX6TDrrqhoT/kzxRUy/s=; b=pAconEEXyGYgTQtT1t5Kzr7nWTDodewsmurQdfjXbfjU8eUk6VeoKfxvGOt3hRNvee bzj71akZN35XA2loJVadmJiWeJIzqbqb4Rck6vkCyZX+F6x69tXvWjahbWasIPxbdSox GmWT9h4IVwliJr0WS/SzqmxSUb0g633m7oFGy7xA4H5NqlXjF81SwwkXvNdOPlZ7qgeq 1YVeBDmaeFRL4yiVme+EwjrOCyn6WUl9r5SOSX2Un8RtmAQwQVfiQLMRTwaQDcLjxjZr afw4ymPbc6WVEZRR01WS3ZIoswxswxCTwgsSyNi3V+y0ucEujp6iN4Ox9MGtWREI0Ebf IxLg== X-Forwarded-Encrypted: i=1; AJvYcCUc9PD4IXXiZmk7cIPpSW6QBLXzenMgbsT/5o3ajUHzoSXjei9B2JWbWqtEqLcpwUHup76AWu5Uylzo7buqZ0wlpnMACFo= X-Gm-Message-State: AOJu0Yyo+ykIw33ChuQBpUnFlF02WtA1ZROsOQkHgLwvfXgLNyzphVCD CDGfRgGR1VJt4vbrPWPv/8bzNrpTFSIievJVd+RGw+ms2DAh0NXTIacTqnxUsLCJrd7eK3APsAZ /F/ZE4KY1f1oLJdkWLBmJA/mxQmUbTtk1xNYavNdIK3XYRHlH32fY X-Received: by 2002:a05:620a:4454:b0:787:3ae4:5f7c with SMTP id w20-20020a05620a445400b007873ae45f7cmr3854412qkp.3.1708033717360; Thu, 15 Feb 2024 13:48:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGta4CxYW1XBck8e1bU7Rfab0ZBGnGroH+Ly7kbbAL2wC03RziZogBTt6kqGN7UsCQXnz9qiQ== X-Received: by 2002:a05:620a:4454:b0:787:3ae4:5f7c with SMTP id w20-20020a05620a445400b007873ae45f7cmr3854393qkp.3.1708033717064; Thu, 15 Feb 2024 13:48:37 -0800 (PST) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id z8-20020a05622a060800b0042c4f46a994sm934873qta.75.2024.02.15.13.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 13:48:36 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Thu, 15 Feb 2024 16:48:35 -0500 (EST) To: Ken Matsui cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [PATCH v5 13/14] c++: Implement __rank built-in trait In-Reply-To: <20240215152037.720162-13-kmatsui@gcc.gnu.org> Message-ID: <4c427657-fdac-6d2c-bd99-9480e33554e2@idea> References: <20240215045258.3025806-1-kmatsui@gcc.gnu.org> <20240215152037.720162-1-kmatsui@gcc.gnu.org> <20240215152037.720162-13-kmatsui@gcc.gnu.org> 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=-13.4 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,T_SCC_BODY_TEXT_LINE 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 Thu, 15 Feb 2024, Ken Matsui wrote: > This patch implements built-in trait for std::rank. > > gcc/cp/ChangeLog: > > * cp-trait.def: Define __rank. > * semantics.cc (trait_expr_value): Handle CPTK_RANK. > (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/cp-trait.def | 1 + > gcc/cp/semantics.cc | 18 ++++++++++++++++-- > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 +++ > gcc/testsuite/g++.dg/ext/rank.C | 14 ++++++++++++++ > 4 files changed, 34 insertions(+), 2 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/ext/rank.C > > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def > index 11270f3ae6b..3d5a7970563 100644 > --- a/gcc/cp/cp-trait.def > +++ b/gcc/cp/cp-trait.def > @@ -95,6 +95,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2) > DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1) > DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1) > DEFTRAIT_EXPR (IS_UNION, "__is_union", 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 256e7ef8166..4f285909b83 100644 > --- a/gcc/cp/semantics.cc > +++ b/gcc/cp/semantics.cc > @@ -12538,6 +12538,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: > + > #define DEFTRAIT_TYPE(CODE, NAME, ARITY) \ > case CPTK_##CODE: > #include "cp-trait.def" > @@ -12698,6 +12701,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2) > case CPTK_IS_SAME: > case CPTK_IS_SCOPED_ENUM: > case CPTK_IS_UNION: > + case CPTK_RANK: > break; > > case CPTK_IS_LAYOUT_COMPATIBLE: > @@ -12729,8 +12733,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); So this will be the first expression-yielding trait that's not a bool. That's no problem conceptually, but I think we hardcode their bool-ness near the top of finish_trait_expr when returning a templated version of the trait. We should instead give templated __rank the type size_type_node. > + } > + 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 5b590db1cf6..a00193c1a81 100644 > --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C > +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C > @@ -167,6 +167,9 @@ > #if !__has_builtin (__is_union) > # error "__has_builtin (__is_union) 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..bab062d776e > --- /dev/null > +++ b/gcc/testsuite/g++.dg/ext/rank.C > @@ -0,0 +1,14 @@ > +// { dg-do compile { target c++11 } } > + > +#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); We should have a test that the __rank inside a template has the correct type, something like (this should currently fail with your patch as-is due to the hardcoded bool type): template void f(T) = delete; void f(bool); template void g() { f(__rank(T)); } template void g(); > -- > 2.43.0 > >