From patchwork Wed Feb 21 09:36:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 204118 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp936599dyc; Wed, 21 Feb 2024 01:59:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXpF7JG7q5wx04JZpZrIl3PKmCatnbg9ungHuqKTEslJV3dVA6TwySBE24TkNm6aiTGXuCVfoeVKdtokYUVbKxhGuyjfw== X-Google-Smtp-Source: AGHT+IGUvh0EEQNUvvXFgGNImkez2LAluLSpUDJSzPJoMsvJPi6vLkVMV9bbsBSTeUEWtZzJNf1I X-Received: by 2002:a05:622a:486:b0:42c:7bc0:b559 with SMTP id p6-20020a05622a048600b0042c7bc0b559mr20412411qtx.47.1708509563904; Wed, 21 Feb 2024 01:59:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708509563; cv=pass; d=google.com; s=arc-20160816; b=U8ja+G/zmM2WwHSOWLJMTBdlGOdsQ0NM5X3TjIFdNzahyDqPL5hg4/q+DI6Qv/UOUh dPsyviOJ5mQqD4HklERJ/fnjRLhHEwH7dKWdLasliA9ZWM1VX0l2ZhR09mBGLKHJq/pY ryHJOfJ9MW8URq/HpeP2BCg1ZLRghuThcC4Hfnwv7LhK1NcmLWY6UBAS9bnxyFH2XmGu CrjHQbaSwX52oJ2Ld1IkUK7WKBZFF8SzV4lYnALEKjYlTRyZJVEHyQk2Ks02ETZCUYjH TrHdJjxD48gaW434d9mUOXmbkuDbY4OTmHEkTMe3eFWm7e9BAY6Aav5BvyCm20IkyLcF M6Ew== 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=AkPqF0DYV/vCJa6fZzr66/usN9PYUvb4qrMfCdmaghE=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=Xn/wGNn+dDtEpT3ND8hHq203ppyd++h5ZqJCN0TcOZ/4xfXa6Ns/G7fsIzjunAh3cB VSZ683kWHrC3q4og06kx/SVstVNNkY9d9/QuXPkAzpvCm9fxoseCatXLx9T/ZwhXkg8D SyjdKtcklt/76WruK1YWkS8mFyejSBhvuLbp0V3etyyEk8E5AIqWi0bOHGN4PY7/Ewij cLx5Kcaek1IWgtIwkN6dzeMrm1nroO8uIZiUYcrbSLFiOpKjkzd3X1IIxclUs6vLO+kf 7Kd48CkmmlJjn30Z0DcjDKJj29pJ2fqlDVQA+DY8Y1eQR67/l+qIXmcdR4ZVELdbVGzv oZgw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jbYi6SvH; 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 e21-20020ac845d5000000b00429d470ea36si9622338qto.592.2024.02.21.01.59.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 01:59:23 -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=jbYi6SvH; 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 8F835385841D for ; Wed, 21 Feb 2024 09:59:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F835385841D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708509563; bh=AkPqF0DYV/vCJa6fZzr66/usN9PYUvb4qrMfCdmaghE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=jbYi6SvH8dGOe7WjuI/B4O41+UtAftyK4LXq43oUqr3QSZZamJAEEGG/PhHpCHegY 4WhIQc2SwqejPL848eY4i+NX1RKvUWVF7nIYnICYYkszzCIhMggtoAs9urJANxecf1 Gg41L2xdAEWCYXaY83Yhz1vCmdfwLxUt7dN+ZBiM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id AB9943858431; Wed, 21 Feb 2024 09:37:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AB9943858431 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 AB9943858431 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708508228; cv=none; b=Nwjv4z9ddrUShxLJbxNAr+Rf2g4o0Y6onKOhS8cP4nqJ6Rp5ZUNS0Gn/xM8ZCcSxEgBkUfQYkyjctXGowxSn+x3xrEL6G5dMH2C+juQK/9ycfBA777pgrmZjpt8MA0M7Xe75TWyz1+OLP/6Yzgf9bznJD5agp5+7aPhvtlixM/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708508228; c=relaxed/simple; bh=vWHVj+3U2Qo51Obig5crCGtC90nv1gYcl0vjSsiLw9Q=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=LdesqGAzqHwa1jUAEF9KF+1bmobJLlVJwQlsFfHbU6UyFSO6Oq4v29sEcyXuhjjXqZrjlzvrr3EJ8EnPPehcRBCmCtSLCDYU+DmKqbtozM4QfO4BIS0d6FRCBpr8f6Z9cwwIo1W1krNFaE7L2jZvjA6z91R8ZjW1K1L3S/mrUKU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247474.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41L9ZKYb010942; Wed, 21 Feb 2024 09:37:02 GMT Received: from mxout23.cac.washington.edu (mxout23.cac.washington.edu [140.142.32.140]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3wd56mb6s4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Feb 2024 09:37:02 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.132]) by mxout23.cac.washington.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 41L9aKXa020582 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 21 Feb 2024 01:36:20 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.128]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW24.02) with ESMTPSA id 41L9aJVb002942 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Feb 2024 01:36:20 -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 v13 11/26] c++: Implement __remove_extent built-in trait Date: Wed, 21 Feb 2024 01:36:01 -0800 Message-ID: <20240221093616.4001742-11-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221093616.4001742-1-kmatsui@gcc.gnu.org> References: <20240221085142.3779280-26-kmatsui@gcc.gnu.org> <20240221093616.4001742-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ZRntncNRJ1jnzYN1A2lClKf1-t124zCQ X-Proofpoint-GUID: ZRntncNRJ1jnzYN1A2lClKf1-t124zCQ 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-20_06,2024-02-20_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1034 lowpriorityscore=0 priorityscore=1501 phishscore=0 spamscore=0 mlxlogscore=344 impostorscore=0 malwarescore=0 adultscore=0 bulkscore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402210075 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: 1791502124479822517 X-GMAIL-MSGID: 1791502124479822517 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 63f879287ce..577c96d579b 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -100,6 +100,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 635441a7a90..58696225fc4 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12793,6 +12793,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 9d861398bae..5d5cbe3b019 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -182,6 +182,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));