From patchwork Thu Feb 15 15:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 201550 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp474899dyb; Thu, 15 Feb 2024 07:26:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVHHZECH9SU9xmrUiu1R/wC8f2Sw1xqyyqy5Ue/BlUCTTSz8UmzfWQGd5QVz+bvVeInDNKBzuvb954I434zbDDCbfdFRg== X-Google-Smtp-Source: AGHT+IF1MO5Uv+3Vv+HItXzauMuugn6dWENSibXnlKoWQB+iC3XGhVNAqRSLXy8/HDqSPJORBUBY X-Received: by 2002:a05:620a:21db:b0:787:273e:287f with SMTP id h27-20020a05620a21db00b00787273e287fmr2292204qka.18.1708010769844; Thu, 15 Feb 2024 07:26:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708010769; cv=pass; d=google.com; s=arc-20160816; b=L3g31d/p5aJ2JpOinuz548zxKYplE/zQXLPSduVnxrbLsH+rX9D6m3iMeRP/UbkFS4 I8Bg3PAEWY+LNAMwaUss2KbjkdbiQbbAH2fRriRs8EXJSMjMdEoKx7jtn8mGHkbhUDmz Muh2C98+8ZuaNZGQPazzc51fVAOZQsxjQZ+GOtoR0AP90FwHUTwNCoTw8vHfpBatr2x+ oeyfBCI7KnYKCIpIQjtCWGVNOqE3+Ps4fI9dtNotT8v7F5E2NfUTB0UwANWPYKSm+Yhw CewUxJUJEaMdX7tF/ochMcTo0sA0xVexQo/xH/y/WPl1osWGGQmqBUkENnxR3ZKyOisa osUw== 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=kZ+K5tpR30j7s72OPm4D4inf8pVx4OAHrDqPRRsYLEg=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=qvMt9XTpLQqnquUaA8tt7Bs4IlVGAPILRWrSxQrtT0Z/iw+ss3rOCrGCTn9PWNn8HH cWOjVv0H82gA9W5pU668S9AZxKSzwukxVtTJTHs8g+ifmX54tklJBW2V1S2p0QbCxTA5 Vf4/7wwDFy9BFvta7Za8yo+jZd0jMz0geD2wD6n6+AJVsRS6yJrEBbgF2yvqFvqUf82v Z0rNTkjXPl+DubXjZ+5dt/OgjTZJ7hsbuCfvTKuZGOQ+e5OgC2Qc0ZKf+DTO1VI8lNKp OK3MV3H4CfZJwjiLSKdgsSKNAScel1Xa4gdTlnfWPwMbXLjqfZ+KdrdZsM9JWkO7cy3P /W8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=s6v13fzO; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id g25-20020a05620a109900b007873204bc3esi1659627qkk.645.2024.02.15.07.26.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 07:26:09 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=s6v13fzO; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 74FD8384DEFD for ; Thu, 15 Feb 2024 15:26:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 74FD8384DEFD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708010769; bh=kZ+K5tpR30j7s72OPm4D4inf8pVx4OAHrDqPRRsYLEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=s6v13fzONURq2wjKqoJ6SWeYBLYtmvz2+wPibfLT8SU3uzrt1I9OBHlc2ZTXLeIDd d36fwmG7pBaNEEVe/abujY4Yw/eEapLAQuF7DQscenP7YWRY96Gf4gx4Y/gl5Eanjh 8GDQU29nheQ9QivGwzmISic6gKpCGoizw4Q76kvo= 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 D66A13865C30; Thu, 15 Feb 2024 15:21:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D66A13865C30 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 D66A13865C30 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=1708010484; cv=none; b=VJUOL259eDKQFgtSQoII0AQGjeOYWd0hpXZwnSverTW9EUiySF+/lkuksAwAhHlFT0nJysVGz5GGNG3g92cUfjxnrgPbxADAIoHiW3v5+mq4+othjgo6YcX2xsuQIgdlIseZuO5i8PZB15Vhdf8Kzylphn7OjR+qjnHXPtG7Z5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708010484; c=relaxed/simple; bh=jhTom434eKiLRibhuOPeZSdzON9GncPNbwMCnXqEZEE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=b6E4c1TrL8gEKFVWsy+J+0Povw0g+GlPDJJDb0IeURD4vkMNgKG7EwJGpj74u/VubSzkqgT7UbH3jdDzq6mbJ9VNefTfR/te78bPF7djNWQBRjm4kZH75E9ffoplpFprlNLRGtYqJyQGyX4qPpN1ebUAkrEYDoklme6+sNUEpY4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247478.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41FFC0K5006651; Thu, 15 Feb 2024 15:21:15 GMT Received: from mxout21.s.uw.edu (mxout21.s.uw.edu [140.142.32.139]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3w94rewhkr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 15:21:15 +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 41FFKlJq013152 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Feb 2024 07:20:47 -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 41FFKkgx029956 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 07:20:47 -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 v5 13/14] c++: Implement __rank built-in trait Date: Thu, 15 Feb 2024 07:20:36 -0800 Message-ID: <20240215152037.720162-13-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240215152037.720162-1-kmatsui@gcc.gnu.org> References: <20240215045258.3025806-1-kmatsui@gcc.gnu.org> <20240215152037.720162-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 1Dm2bOy585TDcIs6OccP2udd2PkJGzxO X-Proofpoint-GUID: 1Dm2bOy585TDcIs6OccP2udd2PkJGzxO 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_14,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 mlxscore=0 malwarescore=0 bulkscore=0 spamscore=0 mlxlogscore=679 lowpriorityscore=0 adultscore=0 suspectscore=0 clxscore=1034 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402150123 X-Spam-Status: No, score=-13.3 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: 1790979100892287560 X-GMAIL-MSGID: 1790979100892287560 This patch implements built-in trait for std::rank. gcc/cp/ChangeLog: * cp-trait.def: Define __rank. * semantics.cc (trait_expr_value): Handle CPTK_RANK. (finish_trait_expr): Likewise. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __rank. * g++.dg/ext/rank.C: New test. Signed-off-by: Ken Matsui --- gcc/cp/cp-trait.def | 1 + gcc/cp/semantics.cc | 18 ++++++++++++++++-- gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 +++ gcc/testsuite/g++.dg/ext/rank.C | 14 ++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/ext/rank.C diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index 11270f3ae6b..3d5a7970563 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -95,6 +95,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2) DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1) DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1) DEFTRAIT_EXPR (IS_UNION, "__is_union", 1) +DEFTRAIT_EXPR (RANK, "__rank", 1) DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2) DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2) DEFTRAIT_TYPE (REMOVE_ALL_EXTENTS, "__remove_all_extents", 1) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 256e7ef8166..4f285909b83 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12538,6 +12538,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2) case CPTK_IS_DEDUCIBLE: return type_targs_deducible_from (type1, type2); + /* __rank is handled in finish_trait_expr. */ + case CPTK_RANK: + #define DEFTRAIT_TYPE(CODE, NAME, ARITY) \ case CPTK_##CODE: #include "cp-trait.def" @@ -12698,6 +12701,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2) case CPTK_IS_SAME: case CPTK_IS_SCOPED_ENUM: case CPTK_IS_UNION: + case CPTK_RANK: break; case CPTK_IS_LAYOUT_COMPATIBLE: @@ -12729,8 +12733,18 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2) gcc_unreachable (); } - tree val = (trait_expr_value (kind, type1, type2) - ? boolean_true_node : boolean_false_node); + tree val; + if (kind == CPTK_RANK) + { + size_t rank = 0; + for (; TREE_CODE (type1) == ARRAY_TYPE; type1 = TREE_TYPE (type1)) + ++rank; + val = build_int_cst (size_type_node, rank); + } + else + val = (trait_expr_value (kind, type1, type2) + ? boolean_true_node : boolean_false_node); + return maybe_wrap_with_location (val, loc); } diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index 5b590db1cf6..a00193c1a81 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -167,6 +167,9 @@ #if !__has_builtin (__is_union) # error "__has_builtin (__is_union) failed" #endif +#if !__has_builtin (__rank) +# error "__has_builtin (__rank) failed" +#endif #if !__has_builtin (__reference_constructs_from_temporary) # error "__has_builtin (__reference_constructs_from_temporary) failed" #endif diff --git a/gcc/testsuite/g++.dg/ext/rank.C b/gcc/testsuite/g++.dg/ext/rank.C new file mode 100644 index 00000000000..bab062d776e --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/rank.C @@ -0,0 +1,14 @@ +// { dg-do compile { target c++11 } } + +#define SA(X) static_assert((X),#X) + +class ClassType { }; + +SA(__rank(int) == 0); +SA(__rank(int[2]) == 1); +SA(__rank(int[][4]) == 2); +SA(__rank(int[2][2][4][4][6][6]) == 6); +SA(__rank(ClassType) == 0); +SA(__rank(ClassType[2]) == 1); +SA(__rank(ClassType[][4]) == 2); +SA(__rank(ClassType[2][2][4][4][6][6]) == 6);