From patchwork Wed Feb 14 13:52:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 200961 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1225559dyb; Wed, 14 Feb 2024 05:54:52 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV4a+Pa6wDFqDipGMYm9e2Ju13HxDQcEai+stMjQvfUW3lhHp5GXDjzMMeiT7azY/7pv55QpYoLGIb92bMFCHRcE/HYeA== X-Google-Smtp-Source: AGHT+IEZrVvKRduB6PaFneB2NWZ7lgpTN+Sj0e8hTzzklHGXEy3z33r4Sf52wh3KCodqkXnJdzm1 X-Received: by 2002:a05:6808:11c5:b0:3c0:3e26:5259 with SMTP id p5-20020a05680811c500b003c03e265259mr2807470oiv.55.1707918891957; Wed, 14 Feb 2024 05:54:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707918891; cv=pass; d=google.com; s=arc-20160816; b=QEBG+dhM5HLfFw34EbBBtBPneK6nU7pd+5vgpiTsni1ffFNt+ajVz0pNf2M/A18odF qpmLBsVEdodavarrv6t7GX7IvhoYx1JiFTQos4H0WV6R1WXWuGSOJPWw5pZDafaUIsU8 O3zSn9uutVT7XLat30O/UBZESO4D91a5L9DrFA1NNLqsk6sdTvlyZAo1+tsqFKkfC2qC KqvGqDDq9zciYTmnKZqFyxneP7iyVwmC3DxrGDemb0y/SzJ6WA77+IlY/fTIRhTHvHzP oVEHkSl8ScLQFCrS4ASghyFEc9dtH0/pB6dS+DV7i2WJhknp31+euNED/puSd6Hn1pik +PYw== 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=qbUQOhcbALOYSO1lfEkx51lKSAWLgpRDrh5jof1fcRM=; fh=nr8ZuRNTapTbNO0dIkzO9RY4HCdBxg36iHBP85tcHQM=; b=IfgdEWDDC4tfhGc4VjoZ/miff8erDX5cc14n6HbxEUD9K2bcMIlPSBUvM64WC52/6a fzgtVrrI7hb0qT3/5o23/mfItT6A4aHoznL36VV7nWDeo7FAY24KvuE0vBSlfVAmtfN2 QRT6hmrvaLYyAo72YsWQRAah4bZF9wI1CoSO51oRgWHF2o0l7AJKG9oaAZnWSybuVNr7 Ld9CXGVruo6i72Nya1YzIwz3ySLLt0k64ArO/SdR3Y9xP7J8Bk0zCPsuQqYv5PCG14hk w7OFlAuIMunY8Ejrql6TjnGsUBxuJLbAP38zovYmThuYqLO38OAXZexUqNo81yJFZOAv deAg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="VNr/to6p"; 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 X-Forwarded-Encrypted: i=2; AJvYcCWy1bt9ItPfTVSU7aGmBr0oJoOdsY00ylc9BPGLB1vEMH+qEREbAZ9Mgkhv1YBdhjbkZ+1G2jhlRrYgn7u8DigrTaFvPg== Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id v21-20020a05622a015500b0042dbda5dfc2si1241892qtw.468.2024.02.14.05.54.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 05:54:51 -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="VNr/to6p"; 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 932D6385E03D for ; Wed, 14 Feb 2024 13:54:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 932D6385E03D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1707918891; bh=qbUQOhcbALOYSO1lfEkx51lKSAWLgpRDrh5jof1fcRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=VNr/to6pLh0O1z9na8dBWUHcMxiOFT5D7n7sA4ow/KRyfYP42jHQ3vc+zma/FHYJh Rll4fkk4pAae46MdkVPfcOJOCeruNYV8SNDShXht9C9XN94ct/re3i+9zYAjfXkDAi MMLrDoOlvsKf43jmmiJ9iqFYHXW/QW1ni4UaaJdo= 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 921F5385E445; Wed, 14 Feb 2024 13:53:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 921F5385E445 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 921F5385E445 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=1707918813; cv=none; b=gN60M8sjBsOx8cCzCjXSvQusFPnpqzlGrHgk2rfN77h9qoC5I2o9g3awEz1SGk9sLp2irthlFMBRcRgqdVfvcqTqO1CCoHZjzcgJGdSMWtGFMQIAhVz01oYv0tTsJRExcLUm2U8CVZYyzmbwAfYKjVqEkjQSfmPSDQXYhHQJ9fo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707918813; c=relaxed/simple; bh=1mqKYWNHghzB3QjRXZuxyRjWMzXq3MTDfr1ct6gMSow=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=rK22rTpMtz4TvK5LCzOFw7p8o2YONi6olf6mqBYss0nbD+vm4COnZOwkVGFEleZCzlRjezl6gGPtvPXtSjKtlfYN7T+Mz5Mx18kLmvkVwLOXm+sZEe1ifbGrv5XbvCkJ2XLNiCmuYRoPaQpejs/JZYjSbOVdB/OY4voGSiECP4c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247479.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41EDo321007609; Wed, 14 Feb 2024 13:53:25 GMT Received: from mxout21.s.uw.edu (mxout21.s.uw.edu [140.142.32.139]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3w8bs7fen1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Feb 2024 13:53:24 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.132]) by mxout21.s.uw.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 41EDr6eL002668 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 Feb 2024 05:53:06 -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 41EDqxIp024820 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Feb 2024 05:53:06 -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 v2 3/4] c++: Implement __remove_extent built-in trait Date: Wed, 14 Feb 2024 05:52:51 -0800 Message-ID: <20240214135252.1416047-3-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214135252.1416047-1-kmatsui@gcc.gnu.org> References: <20240214114448.847646-1-kmatsui@gcc.gnu.org> <20240214135252.1416047-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: 707GzizwdlRkZl-u8ZNZpiDgx_smYCuh X-Proofpoint-ORIG-GUID: 707GzizwdlRkZl-u8ZNZpiDgx_smYCuh 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-14_06,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 mlxscore=0 clxscore=1034 mlxlogscore=465 spamscore=0 adultscore=0 priorityscore=1501 suspectscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402140107 X-Spam-Status: No, score=-13.1 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: 1790882759888094706 X-GMAIL-MSGID: 1790882759888094706 This patch implements built-in trait for std::remove_extent. gcc/cp/ChangeLog: * cp-trait.def: Define __remove_extent. * semantics.cc (finish_trait_type): Handle CPTK_REMOVE_EXTENT. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __remove_extent. * g++.dg/ext/remove_extent.C: New test. Signed-off-by: Ken Matsui --- gcc/cp/cp-trait.def | 1 + gcc/cp/semantics.cc | 5 +++++ gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 +++ gcc/testsuite/g++.dg/ext/remove_extent.C | 16 ++++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/remove_extent.C diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index cec385ee501..3ff5611b60e 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -96,6 +96,7 @@ DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_tempo DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2) DEFTRAIT_TYPE (REMOVE_CV, "__remove_cv", 1) DEFTRAIT_TYPE (REMOVE_CVREF, "__remove_cvref", 1) +DEFTRAIT_TYPE (REMOVE_EXTENT, "__remove_extent", 1) DEFTRAIT_TYPE (REMOVE_POINTER, "__remove_pointer", 1) DEFTRAIT_TYPE (REMOVE_REFERENCE, "__remove_reference", 1) DEFTRAIT_TYPE (TYPE_PACK_ELEMENT, "__type_pack_element", -1) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index e23693ab57f..bf998377c88 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12777,6 +12777,11 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2, type1 = TREE_TYPE (type1); return cv_unqualified (type1); + case CPTK_REMOVE_EXTENT: + if (TREE_CODE (type1) == ARRAY_TYPE) + type1 = TREE_TYPE (type1); + return type1; + case CPTK_REMOVE_POINTER: if (TYPE_PTR_P (type1)) type1 = TREE_TYPE (type1); diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index 56e8db7ac32..4f1094befb9 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -170,6 +170,9 @@ #if !__has_builtin (__remove_cvref) # error "__has_builtin (__remove_cvref) failed" #endif +#if !__has_builtin (__remove_extent) +# error "__has_builtin (__remove_extent) failed" +#endif #if !__has_builtin (__remove_pointer) # error "__has_builtin (__remove_pointer) failed" #endif diff --git a/gcc/testsuite/g++.dg/ext/remove_extent.C b/gcc/testsuite/g++.dg/ext/remove_extent.C new file mode 100644 index 00000000000..6183aca5a48 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/remove_extent.C @@ -0,0 +1,16 @@ +// { dg-do compile { target c++11 } } + +#define SA(X) static_assert((X),#X) + +class ClassType { }; + +SA(__is_same(__remove_extent(int), int)); +SA(__is_same(__remove_extent(int[2]), int)); +SA(__is_same(__remove_extent(int[2][3]), int[3])); +SA(__is_same(__remove_extent(int[][3]), int[3])); +SA(__is_same(__remove_extent(const int[2]), const int)); +SA(__is_same(__remove_extent(ClassType), ClassType)); +SA(__is_same(__remove_extent(ClassType[2]), ClassType)); +SA(__is_same(__remove_extent(ClassType[2][3]), ClassType[3])); +SA(__is_same(__remove_extent(ClassType[][3]), ClassType[3])); +SA(__is_same(__remove_extent(const ClassType[2]), const ClassType));