From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x92d.google.com (mail-ua1-x92d.google.com [IPv6:2607:f8b0:4864:20::92d]) by sourceware.org (Postfix) with ESMTPS id EBCAA386180D for ; Thu, 15 Feb 2024 04:17:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EBCAA386180D 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 EBCAA386180D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::92d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707970670; cv=none; b=xpcOZMcxmgBfWGKOfbkCI+S5gofugUl6l4VElZuvyiSoeosLwkLlV1DFA+kHsIjPe+7kw3zLHkZ2M/uK+D7DQlj4VxevweeMfcHv/j44Uu7jiWCu8KCQv69QLBWGC4n+bqFDu7fmc7r3Fn94XwpTectMHoqrPyagbE5RjfAvh2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707970670; c=relaxed/simple; bh=XvtPfr6NW4Y934GhvY+AvJn/PkyBLxm8EaWWuwkxeA0=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=thew0ykciBW1BJ4CHCmRoU6eQGXQ2HR3gkGb6VJuLwbfByAXDZ5eWgP+k3pM7cSg9CDXOnOQy66C/7bEX7B8Z7VrhKYIx0NzgBVUj6HHBQuj8fi3Is0scV9Av7UTLmLswAyNvzqR1DSRibZv7DBqkJQ4J8XEobttAfV8kVtESak= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ua1-x92d.google.com with SMTP id a1e0cc1a2514c-7d2940ad0e1so279109241.1 for ; Wed, 14 Feb 2024 20:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1707970667; x=1708575467; 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=VI3lzNEAgc8zUyDduMzgZ74gCrcKfwxh0ZXAgoIg2Wg=; b=NOoGrjDr8+r13HEQB2hjQoMZMuEjM4QQPlkZ5Qs8hters24jM+k1W2f0U3hHOTdS7f i8gwM36sKft1B4dABgM6bSLTS6k9DU21YLhVl+W0C+18AlJkAsNW9i62kDttClULoANr hIgpb+25jWWjpYZPMjJK54CghmiumvPV1Kg84= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707970667; x=1708575467; 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=VI3lzNEAgc8zUyDduMzgZ74gCrcKfwxh0ZXAgoIg2Wg=; b=ru+qdjjujqFxoDBi8zf8qsTbQMVrkYCUy+Z7PWuzrDEGZsePKm8YdCARkUSxXsswrV ZdgY0SihyGm11w/L1a//QaufezPaSmLE5eCjGa6UNqOaGiuEGTVA4DqacKbykvhYZyxj JIzrqIimLGKql3rne1kMChb6KIlkpVxZAdK1Pe+XRWIuY/qytcEKfcp3i497LcWMIlhT 1HPvcztCl/cEBTNdhtDNCW7LrlHMXp/lVzuLFQPLMqSoW1EWbq4+gQbVdcs62TqDTI5P hX5YlUudPitVtg2jSejyB8gdYjqtJD7LtGYcBf/YeLA4umiuJ/M6Xxx9xliYITjKPZlo 7Khw== X-Forwarded-Encrypted: i=1; AJvYcCUOy0RBHUY8IHcrCVLmSps8TJFuPQBZf3gTYzqDngM0gZj1aBE9Ko59EaiASftzbdbluRvLiT6CZkbKrI0ClRUErtg2YS8= X-Gm-Message-State: AOJu0YwjEIFS95pWYjL5HYn4d4g9xW3ykBgEs1cKoFq9MCm0JkRCzKQr qmSutqFjQOls99wxM2iYftm4dQ2wyR/xZWq/ymr1MyEbmNYWkPR2P1BLf87v6Zd0n4DskrZQM/c 5Ad+Hu4RDgF57zlfP/+zPSEd/NOpwxLo6G8xxdoRuTf8SkHg1OA== X-Google-Smtp-Source: AGHT+IGx7Kd8MZ+9OT79Mbk1VPugK5z8gHQMLwO83dYkgQwpsy8lkFHzQZgliDEEzUWhFgWDPZeMHACKC8H0M7rTfSQ= X-Received: by 2002:a1f:c342:0:b0:4c0:75d9:c88d with SMTP id t63-20020a1fc342000000b004c075d9c88dmr527512vkf.7.1707970666782; Wed, 14 Feb 2024 20:17:46 -0800 (PST) MIME-Version: 1.0 References: <20240214114448.847646-1-kmatsui@gcc.gnu.org> <20240214135252.1416047-1-kmatsui@gcc.gnu.org> In-Reply-To: From: Ken Matsui Date: Wed, 14 Feb 2024 20:17:10 -0800 Message-ID: Subject: Re: [PATCH v2 1/4] c++: Implement __add_pointer 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=-10.9 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 Wed, Feb 14, 2024 at 12:19=E2=80=AFPM Patrick Palka = wrote: > > On Wed, 14 Feb 2024, Ken Matsui wrote: > > > This patch implements built-in trait for std::add_pointer. > > > > gcc/cp/ChangeLog: > > > > * cp-trait.def: Define __add_pointer. > > * semantics.cc (finish_trait_type): Handle CPTK_ADD_POINTER. > > > > gcc/testsuite/ChangeLog: > > > > * g++.dg/ext/has-builtin-1.C: Test existence of __add_pointer. > > * g++.dg/ext/add_pointer.C: New test. > > > > Signed-off-by: Ken Matsui > > --- > > gcc/cp/cp-trait.def | 1 + > > gcc/cp/semantics.cc | 9 ++++++ > > gcc/testsuite/g++.dg/ext/add_pointer.C | 37 ++++++++++++++++++++++++ > > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ > > 4 files changed, 50 insertions(+) > > create mode 100644 gcc/testsuite/g++.dg/ext/add_pointer.C > > > > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def > > index 394f006f20f..cec385ee501 100644 > > --- a/gcc/cp/cp-trait.def > > +++ b/gcc/cp/cp-trait.def > > @@ -48,6 +48,7 @@ > > #define DEFTRAIT_TYPE_DEFAULTED > > #endif > > > > +DEFTRAIT_TYPE (ADD_POINTER, "__add_pointer", 1) > > DEFTRAIT_EXPR (HAS_NOTHROW_ASSIGN, "__has_nothrow_assign", 1) > > DEFTRAIT_EXPR (HAS_NOTHROW_CONSTRUCTOR, "__has_nothrow_constructor", 1= ) > > DEFTRAIT_EXPR (HAS_NOTHROW_COPY, "__has_nothrow_copy", 1) > > diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc > > index 57840176863..e23693ab57f 100644 > > --- a/gcc/cp/semantics.cc > > +++ b/gcc/cp/semantics.cc > > @@ -12760,6 +12760,15 @@ finish_trait_type (cp_trait_kind kind, tree ty= pe1, tree type2, > > > > switch (kind) > > { > > + case CPTK_ADD_POINTER: > > + if (TREE_CODE (type1) =3D=3D FUNCTION_TYPE > > + && ((TYPE_QUALS (type1) & (TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE= )) > > + || FUNCTION_REF_QUALIFIED (type1))) > > In other parts of the front end, e.g. the POINTER_TYPE case of tsubst, in > build_trait_object, grokdeclarator and get_typeid, it seems we check for > an unqualified function type with > > (type_memfn_quals (type) !=3D TYPE_UNQUALIFIED > && type_mem_rqual (type) !=3D REF_QUAL_NONE) > > which should be equivalent to your formulation except it also checks > for non-standard qualifiers such as __restrict. > > I'm not sure what a __restrict-qualified function type means or if we > care about the semantics of __add_pointer(void () __restrict), but I > reckon we might as well be consistent and use the type_mem_quals/rqual > formulation in new code too? > I see and agree. Thank you for your review! I will update this patch. > > + return type1; > > + if (TYPE_REF_P (type1)) > > + type1 =3D TREE_TYPE (type1); > > + return build_pointer_type (type1); > > + > > case CPTK_REMOVE_CV: > > return cv_unqualified (type1); > > > > diff --git a/gcc/testsuite/g++.dg/ext/add_pointer.C b/gcc/testsuite/g++= .dg/ext/add_pointer.C > > new file mode 100644 > > index 00000000000..3091510f3b5 > > --- /dev/null > > +++ b/gcc/testsuite/g++.dg/ext/add_pointer.C > > @@ -0,0 +1,37 @@ > > +// { dg-do compile { target c++11 } } > > + > > +#define SA(X) static_assert((X),#X) > > + > > +class ClassType { }; > > + > > +SA(__is_same(__add_pointer(int), int*)); > > +SA(__is_same(__add_pointer(int*), int**)); > > +SA(__is_same(__add_pointer(const int), const int*)); > > +SA(__is_same(__add_pointer(int&), int*)); > > +SA(__is_same(__add_pointer(ClassType*), ClassType**)); > > +SA(__is_same(__add_pointer(ClassType), ClassType*)); > > +SA(__is_same(__add_pointer(void), void*)); > > +SA(__is_same(__add_pointer(const void), const void*)); > > +SA(__is_same(__add_pointer(volatile void), volatile void*)); > > +SA(__is_same(__add_pointer(const volatile void), const volatile void*)= ); > > + > > +void f1(); > > +using f1_type =3D decltype(f1); > > +using pf1_type =3D decltype(&f1); > > +SA(__is_same(__add_pointer(f1_type), pf1_type)); > > + > > +void f2() noexcept; // PR libstdc++/78361 > > +using f2_type =3D decltype(f2); > > +using pf2_type =3D decltype(&f2); > > +SA(__is_same(__add_pointer(f2_type), pf2_type)); > > + > > +using fn_type =3D void(); > > +using pfn_type =3D void(*)(); > > +SA(__is_same(__add_pointer(fn_type), pfn_type)); > > + > > +SA(__is_same(__add_pointer(void() &), void() &)); > > +SA(__is_same(__add_pointer(void() & noexcept), void() & noexcept)); > > +SA(__is_same(__add_pointer(void() const), void() const)); > > +SA(__is_same(__add_pointer(void(...) &), void(...) &)); > > +SA(__is_same(__add_pointer(void(...) & noexcept), void(...) & noexcept= )); > > +SA(__is_same(__add_pointer(void(...) const), void(...) const)); > > diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g= ++.dg/ext/has-builtin-1.C > > index 02b4b4d745d..56e8db7ac32 100644 > > --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C > > +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C > > @@ -2,6 +2,9 @@ > > // { dg-do compile } > > // Verify that __has_builtin gives the correct answer for C++ built-in= s. > > > > +#if !__has_builtin (__add_pointer) > > +# error "__has_builtin (__add_pointer) failed" > > +#endif > > #if !__has_builtin (__builtin_addressof) > > # error "__has_builtin (__builtin_addressof) failed" > > #endif > > -- > > 2.43.0 > > > > >