From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa31.google.com (mail-vk1-xa31.google.com [IPv6:2607:f8b0:4864:20::a31]) by sourceware.org (Postfix) with ESMTPS id 2F1C73858C60 for ; Fri, 16 Feb 2024 02:15:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F1C73858C60 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 2F1C73858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::a31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708049725; cv=none; b=E/mIgknR7OkW8T0/kEyTlqdTzaqxn3qE7pHMjb5cYVCFIRLWGpEpP+45nx2ENAlGtend2aHdCLPssbU+nVwW1GCA0lN4kE3TzC1XLavoJa4cdhrTBJuypXtkNNHSq6C7gk7zHUw3dwc0WSxa/1I1r4UHvtIkxxoxtiF85s1CizM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708049725; c=relaxed/simple; bh=5tkt7en55XY2+1HNxfuXEGoBuygapFOSCOSB8LLyRi4=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=U453hbYPkl3eadjaCIEAedp3s/4+kuGqSoMYUgfE8IXk+vwfub3/sEMVX7Wa4BMiD7ZamSXjwLHdgQBa7MTOgWmnQKmEIY9Yay1bh81HID9AlUJViY3L3A7FlBQkRB9eXl3t4mSD05aFQlBafNPB8+EMuMomHQnqLLXZFvGo2y0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-vk1-xa31.google.com with SMTP id 71dfb90a1353d-4bd45397c17so451173e0c.2 for ; Thu, 15 Feb 2024 18:15:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1708049722; x=1708654522; 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=K/wDbbgn6MSJOklcyuDiV/f7gASpqIWxBR7g1v9pSvk=; b=Jta2PWJD82IJphK5x6xkAdyDUxnVbHvlWZPLCcOFHMeWA2OwAXcTP8A+JOx4qihO8c Zrxu8UmtJj/nPPT2C7j3avAqXwt05nvoTItteclTiTBX0ohKzK6Hd4uoqgZntGWDthgY 2T+mJ0/GUa4jFDzP/JnUpAWt/oxLmeXbPvCqk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708049722; x=1708654522; 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=K/wDbbgn6MSJOklcyuDiV/f7gASpqIWxBR7g1v9pSvk=; b=u8/rjnKQZOL6yCw2Muv9PFrYbDz+rbFAXjOd4ElUQ5S0U7kNCn4247m6hr1lx1rVEg vCPSinOIU9kpX4gmxiJEG0+UtKtdESomR3855C5eIMDpC+pmrtSStZgO7Wi4pSWRKGE5 Hk4DVLbSqL+MqVMvm3GFd9LTrgO7CTbuvTqEA4LxrZS4NxXLasqoykTIHQTIRDTrnY8B ivZHZk3PAPIaYHGxSDHRA7y/bEgPijKm2RSKSM7wB4KrJTQg5HGC1dSzSLYB8SXKP6xe XwGf3vXp1d2JJIObj6X8nc+PHY1zYlW4eJYpfcoY/YI1sKBYfW7DaKTWtUcHR+BaxMOe psxg== X-Forwarded-Encrypted: i=1; AJvYcCWP16JcGYZciy0LbbpnyWcSzLFT5LuQQkh1e3EOwW9iZN19PDuCat5fs0C4MCVZRwdE+k4WmcMQ3Ba49hWRXFaICelMhf6wcw== X-Gm-Message-State: AOJu0YxZ38DBKLM/bPv5MkKrYeUJyPP56Sa/MFOXnRY9uQChPWfqQZh3 tAyLaTD6N6RurH9YhAlbbps4YeSd0yXPzIldPaqVYAbtZhk5u3EKiAZqr+UVoKiVxJC4CISaHgC Fxn6y5N/NRlcLpi6/Sb3qxDj6oB4FljUXtE4SIdasIbBIalnLdg== X-Google-Smtp-Source: AGHT+IH9b0aiKOAROPxIyZO2nr24vFpWig7speKqnqQMTR8I0elVIxhZZzfpdcqGzVjWxge/o8PGjFDdVUB46u24810= X-Received: by 2002:a1f:6201:0:b0:4c0:3545:285 with SMTP id w1-20020a1f6201000000b004c035450285mr3816277vkb.5.1708049722181; Thu, 15 Feb 2024 18:15:22 -0800 (PST) MIME-Version: 1.0 References: <20240215045258.3025806-1-kmatsui@gcc.gnu.org> <20240215152037.720162-1-kmatsui@gcc.gnu.org> <20240215152037.720162-13-kmatsui@gcc.gnu.org> <4c427657-fdac-6d2c-bd99-9480e33554e2@idea> In-Reply-To: <4c427657-fdac-6d2c-bd99-9480e33554e2@idea> From: Ken Matsui Date: Thu, 15 Feb 2024 18:14:46 -0800 Message-ID: Subject: Re: [PATCH v5 13/14] c++: Implement __rank built-in trait To: Patrick Palka 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=-13.0 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,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, Feb 15, 2024 at 1:48=E2=80=AFPM Patrick Palka w= rote: > > 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_trivial= ly_assignable", 2) > > DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructib= le", -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 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: > > + > > #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_kin= d 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_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); > > 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_no= de. > > > + } > > + 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 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) =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); > > 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) =3D delete; > void f(bool); > > template > void g() { f(__rank(T)); } > > template void g(); > Thank you! I think this test should be the following, to fail with my patch as-is: - void f(bool); + void f(size_t); since we are expecting size_t from __rank. The current patch passed this test and failed with a test with change, and my updated patch failed with this test and passed a test with this change. I will submit the updated patch soon. Thank you for pointing this out! > > -- > > 2.43.0 > > > > >