From patchwork Thu Feb 15 12:48:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 201452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp374207dyb; Thu, 15 Feb 2024 04:53:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXU+m9kWehxbqcb1iJ2nb9rdRnI6clS5i2ZRm3JB9kyiYdFoKKKZxDZ58ZEXR8KKFssuP57zFPNCt7N9qOXvvWQ7F2khg== X-Google-Smtp-Source: AGHT+IG4Obuo1Vqf96j+HeMTHT0i2Dg2XTP/dZK6GbW40z60mqRLGwEDLAJstFZWR2TtWsGBjake X-Received: by 2002:a05:622a:1a09:b0:42d:c289:4e64 with SMTP id f9-20020a05622a1a0900b0042dc2894e64mr2305016qtb.55.1708001590703; Thu, 15 Feb 2024 04:53:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708001590; cv=pass; d=google.com; s=arc-20160816; b=J7br3w9ZahEGiMMDOHx6HOjrgJqJYUJdzr0V9r71zYVJOt/aBtimRJWBy1oIufdYQN oJXDItkRlkZXph0o7Qm6cfz16MIoljBQ0krBk5ZD5c9CeR7n40e5QFDTz4MrrmK78IrL rHrESCuN5qAihXv7Yo9HacVG8F5LkNvT6rg17HdqbC+OZ+rjfJYkKqepQxfVw8sjVovt 5WxnM7q42bVd2gAEnkQYt1AyT15Y1ZcRgBIqVe3dYkBhCUhfmVLt98YD4NWAWP4UBCJa RLIL09LA+n4pDehJdRP8RtysRE5OJaEhd3SKH7NjvI0GX/u/721iUzHeCLm3yWy7Ly7v trvg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=CQn/RaNZK1Npnku0QOkPqekp03YW8Z4Djjcb5psxz7s=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=LbZ0ikEgMEypQW1TSoQFih7He3OyCGj4xh82O5j0sTM6ka6MicyfQLHIsP1gPCoKPq ncx0UCcDUyUsyfazVIR6XAVOYC9d0KWb32KZcmbQcfOwZiE/EoEJalYc96o/52UzTeHm mqUq+h/B1zITylE0Tr+qX0Bw4kYbSG/8hGXlUyk4oZ2yNbL7GAwX5UM7AWJpvlB9mmzZ qYnibMN8Hv//1SQF1S+uPKDWaj5TCtwKdy7KQJX1gYcCWq0B0gCIyyMNjFb4NP6AQ0iB 6NY1qeIo2/ItZGrQGFOjuu1MapP8P5z3B45ijfG0LiUwR2WxsYHIxrmw91xLN5kpcPJu DC8A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=rzsD57ok; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id t7-20020ac85887000000b0042dd7b512c0si93120qta.420.2024.02.15.04.53.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 04:53:10 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=rzsD57ok; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 505F83864879 for ; Thu, 15 Feb 2024 12:53:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 505F83864879 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708001590; bh=CQn/RaNZK1Npnku0QOkPqekp03YW8Z4Djjcb5psxz7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=rzsD57ok9y7ujYIn8t0/oP/M0FP/4VRLT6g1mV0ckqgUr8ehsRG1aMXrXvxUulj95 H1ppdYKvFa3oIW95i7M9NqYWhzzRyo/pWPEkYQ7QVkkTrH76iKVbH5OrHk0C7GWiAx Cx18jPTQ3Q1x/r2r6UELiVtAUXjzzYuF1Z/LuLhI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00641c01.pphosted.com (mx0b-00641c01.pphosted.com [205.220.177.146]) by sourceware.org (Postfix) with ESMTPS id 86030384DED6; Thu, 15 Feb 2024 12:48:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 86030384DED6 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 86030384DED6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.177.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708001342; cv=none; b=wH/RbyKUYMDqn0xGxodd5FKa1yEhO7T1DNoQ8ydlPLCS+paIEJkfsk9vz3RQV1M6vLXVeMBw5I77CfXsFrqIa70nADMMmsP5paswO/AP7kbBaHKPKtO5tBOD6ZlhgllP2Ib9J8Fq6ZtehSiJUcO0NtgoCQAxARN6Wmfs2z2o14M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708001342; c=relaxed/simple; bh=/vOyzEjhUKqKYVTHlozJ5tjfs5N2lDpixB5PcU/fr28=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=RPp3z9HXpt9tigyqnOVafN5G4nZT7i4Ba78ysMnC0BQEL799DmCshcyyIwcIXuWfCAmoNr9+ESb4XjayVpfNe04TjFsGImiPZ+QS3T9QOfxN0CxPZYPzvOMJZpDbvypbRTTAJNPYB999mGCO+ZpKp7nyIxlmSL5BigrKP0GEJGs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247476.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41FCg5Yu000828; Thu, 15 Feb 2024 12:48:51 GMT Received: from mxout21.s.uw.edu (mxout21.s.uw.edu [140.142.32.139]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3w92uh5shd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 12:48:50 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout21.s.uw.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 41FCmfJs022592 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Feb 2024 04:48:41 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.143]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW24.02) with ESMTPSA id 41FCmbO0021397 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 04:48:41 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH v4 07/12] c++: Implement __add_lvalue_reference built-in trait Date: Thu, 15 Feb 2024 04:48:19 -0800 Message-ID: <20240215124824.310810-7-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240215045258.3025806-1-kmatsui@gcc.gnu.org> References: <20240215045258.3025806-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: kspvkdyPzKx6xlLwK6MDsmJGHiks9cwy X-Proofpoint-ORIG-GUID: kspvkdyPzKx6xlLwK6MDsmJGHiks9cwy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-15_12,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=814 mlxscore=0 priorityscore=1501 malwarescore=0 spamscore=0 impostorscore=0 adultscore=0 phishscore=0 bulkscore=0 clxscore=1034 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402150102 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NEUTRAL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790969475577799651 X-GMAIL-MSGID: 1790969475577799651 This patch implements built-in trait for std::add_lvalue_reference. gcc/cp/ChangeLog: * cp-trait.def: Define __add_lvalue_reference. * semantics.cc (finish_trait_type): Handle CPTK_ADD_LVALUE_REFERENCE. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __add_lvalue_reference. * g++.dg/ext/add_lvalue_reference.C: New test. Signed-off-by: Ken Matsui --- gcc/cp/cp-trait.def | 1 + gcc/cp/semantics.cc | 8 +++++++ .../g++.dg/ext/add_lvalue_reference.C | 21 +++++++++++++++++++ gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 +++ 4 files changed, 33 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/add_lvalue_reference.C diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index ce29108bad6..7dcc6bbad76 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_LVALUE_REFERENCE, "__add_lvalue_reference", 1) 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) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index c8ac5167c3c..82fc31d9f9b 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12760,6 +12760,14 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2, switch (kind) { + case CPTK_ADD_LVALUE_REFERENCE: + if (VOID_TYPE_P (type1) + || (FUNC_OR_METHOD_TYPE_P (type1) + && (type_memfn_quals (type1) != TYPE_UNQUALIFIED + || type_memfn_rqual (type1) != REF_QUAL_NONE))) + return type1; + return cp_build_reference_type (type1, /*rval=*/false); + case CPTK_ADD_POINTER: if (FUNC_OR_METHOD_TYPE_P (type1) && (type_memfn_quals (type1) != TYPE_UNQUALIFIED diff --git a/gcc/testsuite/g++.dg/ext/add_lvalue_reference.C b/gcc/testsuite/g++.dg/ext/add_lvalue_reference.C new file mode 100644 index 00000000000..8fe1e0300e5 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/add_lvalue_reference.C @@ -0,0 +1,21 @@ +// { dg-do compile { target c++11 } } + +#define SA(X) static_assert((X),#X) + +class ClassType { }; + +SA(__is_same(__add_lvalue_reference(int), int&)); +SA(__is_same(__add_lvalue_reference(int&), int&)); +SA(__is_same(__add_lvalue_reference(const int), const int&)); +SA(__is_same(__add_lvalue_reference(int*), int*&)); +SA(__is_same(__add_lvalue_reference(ClassType&), ClassType&)); +SA(__is_same(__add_lvalue_reference(ClassType), ClassType&)); +SA(__is_same(__add_lvalue_reference(int(int)), int(&)(int))); +SA(__is_same(__add_lvalue_reference(int&&), int&)); +SA(__is_same(__add_lvalue_reference(ClassType&&), ClassType&)); +SA(__is_same(__add_lvalue_reference(void), void)); +SA(__is_same(__add_lvalue_reference(const void), const void)); +SA(__is_same(__add_lvalue_reference(bool(int) const), bool(int) const)); +SA(__is_same(__add_lvalue_reference(bool(int) &), bool(int) &)); +SA(__is_same(__add_lvalue_reference(bool(int) const &&), bool(int) const &&)); +SA(__is_same(__add_lvalue_reference(bool(int)), bool(&)(int))); diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index 9af64173524..1046ffe7d01 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_lvalue_reference) +# error "__has_builtin (__add_lvalue_reference) failed" +#endif #if !__has_builtin (__add_pointer) # error "__has_builtin (__add_pointer) failed" #endif