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 62F973858D37 for ; Tue, 21 Mar 2023 11:29:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62F973858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679398177; 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=CRonG0RDXAoxG46/O6ZYlgy6rWyTSGhSBQSZKc3sxLc=; b=T7kNzyko009D7tXy3HZ54vijR5lj5IV07CZF5txkASQN+uhFyMSpeRU52VsGsmu9J1em/N ln9MtpcifIpqy4CJujXTi4y3DVA8+jHiP3fjLS9TzA3yUwe6E3CTU7Mo80N3HcU7jEApp8 MIETcVVahBhTEbv21PxMk6KzZTqv9P0= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-435-KNuyvUOVOpWeCZyFbu6CbA-1; Tue, 21 Mar 2023 07:29:35 -0400 X-MC-Unique: KNuyvUOVOpWeCZyFbu6CbA-1 Received: by mail-lf1-f72.google.com with SMTP id e12-20020ac24e0c000000b004e84231dde1so5417801lfr.15 for ; Tue, 21 Mar 2023 04:29:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679398174; h=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=CRonG0RDXAoxG46/O6ZYlgy6rWyTSGhSBQSZKc3sxLc=; b=mUJxrMMgIzzvHug0/WKIyvDBITnVrh9qbiNRAMbhgWBPIdUAtIc5sMybgCjoHuRBuT jWIyZHHu31iOe43Gdarim5PZQ36Wgl47O0yK+bY+uEvAvMOM1hrwCRMusmk5+hfek9jm +S4Kr6CSyIpysDVEpjJ9ymo3O59aPK9sxZ8w8mLPWY0STZM3A4c6h7f3DhDIgly7pu1/ +PK10qjq62c+i4dTNlJ+deZf5XHy2F2pv54AGfm390dzDh0fmu2ap7drSTuZaXcb7/ST RE5MrbNdvVIpAZi6EYkT7qn7stdtlc5nRyDy85fAlsEmeGuHKTU7T2gOS0POiQton4i5 1Dhg== X-Gm-Message-State: AO0yUKVG3M4/YqOQH3pg6zzdNOgOKdcbW85Bo2luB0rtq+j43wE07oAj PO9gpc7h0SctxCh4XAH/8mHDwN+yY7zDNM6FcoQW9Rye/1c1nrmQERr+CiYI1adQKEeSrcKjI8X b/eEAuhVxTLIM1ndpKIlJ6DCRuQUZkutPMQAquRiskA== X-Received: by 2002:ac2:4c18:0:b0:4e9:d7b3:97a6 with SMTP id t24-20020ac24c18000000b004e9d7b397a6mr706453lfq.8.1679398174424; Tue, 21 Mar 2023 04:29:34 -0700 (PDT) X-Google-Smtp-Source: AK7set/FLUzBpVTEAZ0V1Qd0I8fo8Kwt9WXLkktbSNFf+hpeQQWoyftUj1Cf8F0nzfsXInLS98gIDzMRJ52jJW7ArEc= X-Received: by 2002:ac2:4c18:0:b0:4e9:d7b3:97a6 with SMTP id t24-20020ac24c18000000b004e9d7b397a6mr706445lfq.8.1679398174158; Tue, 21 Mar 2023 04:29:34 -0700 (PDT) MIME-Version: 1.0 References: <20230321111056.78121-1-kmatsui@cs.washington.edu> In-Reply-To: From: Jonathan Wakely Date: Tue, 21 Mar 2023 11:29:23 +0000 Message-ID: Subject: Re: [PATCH 1/2] c++: implement __add_const built-in trait To: Ken Matsui Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, ppalka@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="0000000000009b85f905f7675bce" X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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: --0000000000009b85f905f7675bce Content-Type: text/plain; charset="UTF-8" On Tue, 21 Mar 2023 at 11:26, Jonathan Wakely wrote: > > > On Tue, 21 Mar 2023 at 11:12, Ken Matsui via Libstdc++ < > libstdc++@gcc.gnu.org> wrote: > >> This patch implements built-in trait for std::add_const. >> >> gcc/cp/ChangeLog: >> >> * cp-trait.def: Define __add_const. >> * semantics.cc (finish_trait_type): Handle CPTK_ADD_CONST. >> >> gcc/testsuite/ChangeLog: >> >> * g++.dg/ext/has-builtin-1.C: Test existence of __add_const. >> * g++.dg/ext/add_const.C: New test. >> --- >> gcc/cp/cp-trait.def | 1 + >> gcc/cp/semantics.cc | 6 ++++ >> gcc/testsuite/g++.dg/ext/add_const.C | 39 ++++++++++++++++++++++++ >> gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ >> 4 files changed, 49 insertions(+) >> create mode 100644 gcc/testsuite/g++.dg/ext/add_const.C >> >> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def >> index bac593c0094..e362c448c84 100644 >> --- a/gcc/cp/cp-trait.def >> +++ b/gcc/cp/cp-trait.def >> @@ -91,6 +91,7 @@ DEFTRAIT_TYPE (REMOVE_CV, "__remove_cv", 1) >> DEFTRAIT_TYPE (REMOVE_REFERENCE, "__remove_reference", 1) >> DEFTRAIT_TYPE (REMOVE_CVREF, "__remove_cvref", 1) >> DEFTRAIT_TYPE (UNDERLYING_TYPE, "__underlying_type", 1) >> +DEFTRAIT_TYPE (ADD_CONST, "__add_const", 1) >> >> /* These traits yield a type pack, not a type, and are represented by >> cp_parser_trait as a special BASES tree instead of a TRAIT_TYPE >> tree. */ >> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc >> index 87c2e8a7111..14e27a71a55 100644 >> --- a/gcc/cp/semantics.cc >> +++ b/gcc/cp/semantics.cc >> @@ -12273,6 +12273,12 @@ finish_trait_type (cp_trait_kind kind, tree >> type1, tree type2) >> if (TYPE_REF_P (type1)) >> type1 = TREE_TYPE (type1); >> return cv_unqualified (type1); >> + case CPTK_ADD_CONST: >> + if (TYPE_REF_P (type1) || TYPE_PTRFN_P (type1)) >> + return type1; >> + return cp_build_qualified_type (type1, >> + cp_type_quals (type1) | >> + TYPE_QUAL_CONST); >> >> #define DEFTRAIT_EXPR(CODE, NAME, ARITY) \ >> case CPTK_##CODE: >> diff --git a/gcc/testsuite/g++.dg/ext/add_const.C >> b/gcc/testsuite/g++.dg/ext/add_const.C >> new file mode 100644 >> index 00000000000..1c8618a8b00 >> --- /dev/null >> +++ b/gcc/testsuite/g++.dg/ext/add_const.C >> @@ -0,0 +1,39 @@ >> +// { dg-do compile { target c++11 } } >> + >> +#define SA(X) static_assert((X),#X) >> + >> +SA(__is_same(__add_const(void), const void)); >> +SA(__is_same(__add_const(int), const int)); >> + >> +SA(__is_same(__add_const(const int), const int)); >> +SA(__is_same(__add_const(volatile int), const volatile int)); >> +SA(__is_same(__add_const(const volatile int), const volatile int)); >> + >> +SA(__is_same(__add_const(int*), int* const)); >> +SA(__is_same(__add_const(int* const), int* const)); >> +SA(__is_same(__add_const(int* volatile), int* const volatile)); >> +SA(__is_same(__add_const(int* const volatile), int* const volatile)); >> + >> +SA(__is_same(__add_const(const int*), const int* const)); >> +SA(__is_same(__add_const(volatile int*), volatile int* const)); >> +SA(__is_same(__add_const(const volatile int*), const volatile int* >> const)); >> + >> +SA(__is_same(__add_const(int&), int&)); >> +SA(__is_same(__add_const(const int&), const int&)); >> +SA(__is_same(__add_const(volatile int&), volatile int&)); >> +SA(__is_same(__add_const(const volatile int&), const volatile int&)); >> + >> +SA(__is_same(__add_const(int&&), int&&)); >> +SA(__is_same(__add_const(const int&&), const int&&)); >> +SA(__is_same(__add_const(volatile int&&), volatile int&&)); >> +SA(__is_same(__add_const(const volatile int&&), const volatile int&&)); >> + >> +SA(__is_same(__add_const(int[3]), const int[3])); >> +SA(__is_same(__add_const(const int[3]), const int[3])); >> +SA(__is_same(__add_const(volatile int[3]), const volatile int[3])); >> +SA(__is_same(__add_const(const volatile int[3]), const volatile int[3])); >> + >> +SA(__is_same(__add_const(int(int)), int(int))); >> +SA(__is_same(__add_const(int(*const)(int)), int(*const)(int))); >> +SA(__is_same(__add_const(int(*volatile)(int)), int(*volatile)(int))); >> > > This looks wrong. > It might be useful to test pointer-to-member types too. And for completeness, a class type. > >> +SA(__is_same(__add_const(int(*const volatile)(int)), int(*const >> volatile)(int))); >> diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C >> b/gcc/testsuite/g++.dg/ext/has-builtin-1.C >> index f343e153e56..dd331ebbc9a 100644 >> --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C >> +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C >> @@ -146,3 +146,6 @@ >> #if !__has_builtin (__remove_cvref) >> # error "__has_builtin (__remove_cvref) failed" >> #endif >> +#if !__has_builtin (__add_const) >> +# error "__has_builtin (__add_const) failed" >> +#endif >> -- >> 2.40.0 >> >> --0000000000009b85f905f7675bce--