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.129.124]) by sourceware.org (Postfix) with ESMTPS id C31E63858D34 for ; Tue, 30 Apr 2024 20:58:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C31E63858D34 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 C31E63858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714510732; cv=none; b=nFLA0Xa56l/k94J82OagiPNE9Xf4Ayd3vFQrnJJvuaXidvcdUE2ttfsbeC+HyxJbLX6W+czTNSx5xlx1l1UQhxeg++YkW1qC/XtFZQ5IrOx3QtvA740WZJsQe0XPfgx5c/A4EiWPVjwh05k1AYauqWpksJWHjqozPaTniFYTA8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714510732; c=relaxed/simple; bh=DNUMc+ZkBfbRmwOaeV0iH6lZAAxq4xj2xCjzzS1iyJ4=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=Mp8NI0AlmkFpDQQm+j1Mt3XI5cgjMHUGGKhIz4tGOzHapPWSXlseSFsczHKvtdpLdv1uQRQR2U8kFl5wgk2eDnwBTz3SdRADRgzda99PLDKQvEjKCNH4tqJmrMHSS13DMG6FuNrmrOqQYxd/SX45ddNO8fT7ATj7M5/mnLvFAt0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714510730; 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=MB6oIUM+cwYSEBjwa/42ENk3wEws7u1nzmJyF3ZPnlo=; b=C1otZevJJH6HnjI138/8iMBcZFy7saxZWbwr8Y4ybxoZZUCgJkyttsQWuctpryitJqaGxc iLN1WEbiyQhycl3SFj4HkiJ1hxGKQWFZ1j7Qise6oZwHDDi400EalV7xDOLCXgTTrUCto4 hjc1aJZci7/xf7eZOM+meOUxeAHfxGU= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-599-Fx8quMx_Mq-n9ohTxSwRyA-1; Tue, 30 Apr 2024 16:58:49 -0400 X-MC-Unique: Fx8quMx_Mq-n9ohTxSwRyA-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-790f5d83b2dso332699085a.1 for ; Tue, 30 Apr 2024 13:58:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714510728; x=1715115528; 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=MB6oIUM+cwYSEBjwa/42ENk3wEws7u1nzmJyF3ZPnlo=; b=Cfz1SXu+fVFoF4ux/JqvYG5FfyPNliorolIs9Ec69fe84gi8EIzMkjSnOlrQfShI7o LXQ2tmFAglUuSj+hRzT8y+6sqvcwwmFBlPUOKfIxcd7JAotTOwGRDUt4enhecLaFRG9N jotjDILfpvEw0wjJSrQs7JTu6dHSmuEoIOK1TiuZFZYmXHFcKPwrAIqc7kM7XOqVLaMS co6ZP/FBtTmMqroxgTvTJLdGP65c8vXRB7wIpSvpjnC0FJNbD+6rGfLeBMxhgBaqqLem LxajgV9kE5IgKKmZtXFzBT9zIVVDIStzdgbZCDTngf/6fKrisK3DWKZjDfxKwTaA60X+ J89g== X-Gm-Message-State: AOJu0Ywz2jClH1vnfVlRqXbcOfjy/5vNHE7DDAg2tCeEqV/q0nwsVQ5I xrT5Zyqh0sa8qd8jTD3HX424zZMTPdDXZS2IznM+vvvZ0JYLqths4XENEtIX/89qkJRarHlTF7O vy39PWNR3RaWjBAV2VEX0Nr69MnWFhBlsSz+wqIELhapU4zpODcoyPQpLylZ2 X-Received: by 2002:a05:620a:450d:b0:78d:6150:fc16 with SMTP id t13-20020a05620a450d00b0078d6150fc16mr542435qkp.33.1714510728310; Tue, 30 Apr 2024 13:58:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFAUIBgxLD2WwKIdgjrxS+auZwBysN1fTWuYDblRyQHVm+3BWp1mYgMQLplbONjf5pK0ggIFg== X-Received: by 2002:a05:620a:450d:b0:78d:6150:fc16 with SMTP id t13-20020a05620a450d00b0078d6150fc16mr542427qkp.33.1714510728010; Tue, 30 Apr 2024 13:58:48 -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 x12-20020a05620a0ecc00b00790f5c821f3sm2078698qkm.132.2024.04.30.13.58.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Apr 2024 13:58:47 -0700 (PDT) Message-ID: <1f0202bf-938f-401d-b156-d46ee49ce5ec@redhat.com> Date: Tue, 30 Apr 2024 16:58:46 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v14 09/26] c++: Implement __add_pointer 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-10-kmatsui@gcc.gnu.org> From: Jason Merrill In-Reply-To: <20240228192843.188979-10-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=-14.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,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable 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::add_pointer. OK. > 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 | 39 ++++++++++++++++++++++++ > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ > 4 files changed, 52 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 05514a51c21..63f879287ce 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 1794e83baa2..635441a7a90 100644 > --- a/gcc/cp/semantics.cc > +++ b/gcc/cp/semantics.cc > @@ -12776,6 +12776,15 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2, > > switch (kind) > { > + case CPTK_ADD_POINTER: > + if (FUNC_OR_METHOD_TYPE_P (type1) > + && (type_memfn_quals (type1) != TYPE_UNQUALIFIED > + || type_memfn_rqual (type1) != REF_QUAL_NONE)) > + return type1; > + if (TYPE_REF_P (type1)) > + type1 = 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..c405cdd0feb > --- /dev/null > +++ b/gcc/testsuite/g++.dg/ext/add_pointer.C > @@ -0,0 +1,39 @@ > +// { 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 = decltype(f1); > +using pf1_type = decltype(&f1); > +SA(__is_same(__add_pointer(f1_type), pf1_type)); > + > +void f2() noexcept; // PR libstdc++/78361 > +using f2_type = decltype(f2); > +using pf2_type = decltype(&f2); > +SA(__is_same(__add_pointer(f2_type), pf2_type)); > + > +using fn_type = void(); > +using pfn_type = 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)); > + > +SA(__is_same(__add_pointer(void() __restrict), void() __restrict)); > diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C > index b1430e9bd8b..9d861398bae 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-ins. > > +#if !__has_builtin (__add_pointer) > +# error "__has_builtin (__add_pointer) failed" > +#endif > #if !__has_builtin (__builtin_addressof) > # error "__has_builtin (__builtin_addressof) failed" > #endif