From patchwork Wed Dec 20 19:08:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 181749 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2864830dyi; Wed, 20 Dec 2023 11:09:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IG0XVco4eKY2qfgIlfM/U+IRblN5r2xzxWFX9iLKqvpNQrtEnMPyhkKYrCyjbY399PVWBD8 X-Received: by 2002:a05:620a:6110:b0:77f:983d:9603 with SMTP id oq16-20020a05620a611000b0077f983d9603mr13908839qkn.22.1703099374133; Wed, 20 Dec 2023 11:09:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1703099374; cv=pass; d=google.com; s=arc-20160816; b=RMu+9LiWWiTwYcyNrRlTMy/GSxgpDmt8fyg2pltABf9L19Pp2bRFzaacZP4tB4mdm6 n0GpKKvFV8L7v+UAUePLQ6H7wjkdtQL+5oPXvVjisT4iY+pho6CtMlChZSbneZ18bRwJ lg0olpNx6bJBgrXIxcIaB0cLXFJ2Nmnx+4qaiJqc3llWynlcRfYNOipBZD2ETG3c2lY3 1eoqfyZ5xF/uDChlPxafm2Cc0yA8GPX2PinHP60K/j6/wqEUj3z0mHYDF5o4qA6xAXUD Lu1Li+NWQCB2qGnAHxo6qBTt+raNCatWEfYqM7g+A0LyESoCd2MoS3ET9mI8Fexi09I/ 6pPg== 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=3muefRgLBWbQQIYq/xLDFnWm0XTIvS7f0IETkSqsXVI=; fh=INZSbTxGthcJ6LtyIn70+VzOfwJL3SRgAHGh2CURDOU=; b=zAVnOIBlg/vtrgr5wwcUBG5AIq3+KoL4USAsqWQ7L2hCDQ9wbklC5CjW+vtlmcx1M6 naLX3hUIZoY2Q2jhILYDmMTFJyd/BqPpVhX2fbpbp8r+tii2F6F96RfzjEfIeoEYidiQ FxDtjR3d8L1VZDin9uCSasitymBU/wMB505SoTWIJrcH2k3uFLdf78+kQPLkKPCCPkL3 y3BwxwPrguYjzczXfRSjIPfvJ9Tthi0d/35zOCP40wVO5X5O5Pi7sB3UR3SDDkE+H80k Um91i2PnxZQURyCH1DCiA3Ou83pjgsIgMVzaf9/EcSxHkLzS2zvifnLaVbjBKBeDKU18 /nPQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=DpH2IyAp; 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 a10-20020a05622a064a00b00427810cb2absi324055qtb.492.2023.12.20.11.09.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 11:09:34 -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=DpH2IyAp; 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 18BF4385ED72 for ; Wed, 20 Dec 2023 19:09:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 18BF4385ED72 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1703099373; bh=3muefRgLBWbQQIYq/xLDFnWm0XTIvS7f0IETkSqsXVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=DpH2IyApeyhyhvGume7JPH6/i1LA5f+aV8TYFBxNmU0UADeVJP+HAvR0pDp4EQvEu amssSK857/VMVFxmkiCSLj19oxBhj1T1uqzyho2WPs1rvoZnweXgB94vjYtLYX8GPN TI3t1KD1n0MEPBxZNpO2Hi2cuu0+hxBxsIj69kUQ= 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 989833858439; Wed, 20 Dec 2023 19:08:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 989833858439 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 989833858439 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=1703099332; cv=none; b=s15n433o1St+mdtwqbK8aZjm/sbz3+ywfj0hp76ZIvbBt68tEI+grrnPjjeJ/XEqj+4eo/2dGLusAANBpIE/oiAU0rcYa/3i/ndivX1BV7BHrilEMUx/7+idcNrGQ0HrK1zba6f9baJNSwXx/L/eBhl7QakiJnp+FMb32yf3dzg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703099332; c=relaxed/simple; bh=gQl9P3odmo+5d5uIwjeU9mnuFcYFEQ+289f0h8HrEvU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=mKnUVMDvXC9a/5TuRmcQEDvXzjQJzzKgwAeq2z9AcwB81LZq4YbB5GkEfyTcHb50ECoSF1kFkC/dRL/sT2uW5IafJUpnVO9s20yqkBO7wAXvsjqG0ZvvrTBH+cjupX7+sba35gvsm9A2lq76TN9eYax5gkIx0bMFxAzRkevtpxI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247475.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BKJ0K2I010389; Wed, 20 Dec 2023 19:08:48 GMT Received: from mxout23.cac.washington.edu (mxout23.cac.washington.edu [140.142.32.140]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3v43epsy03-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 19:08:47 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout23.cac.washington.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 3BKJ8ZdC028229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Dec 2023 11:08:35 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.194]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 3BKJ8ZtN021068 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 11:08:35 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: Ken Matsui Subject: [PATCH] testsuite: Remove testsuite_tr1.h Date: Wed, 20 Dec 2023 11:08:24 -0800 Message-ID: <20231220190824.399818-1-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: SgsTaWC-XOdIrC2obwUQg0hWJy9KDp6V X-Proofpoint-GUID: SgsTaWC-XOdIrC2obwUQg0hWJy9KDp6V X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-06_20,2023-12-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 clxscore=1034 mlxlogscore=999 impostorscore=0 spamscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312200119 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, RCVD_IN_MSPIKE_H4, 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: 1785829129284128583 X-GMAIL-MSGID: 1785829129284128583 This patch removes the testsuite_tr1.h dependency from g++.dg/ext/is_*.C tests since the header is supposed to be used only by libstdc++, not front-end. This also includes test code consistency fixes. gcc/testsuite/ChangeLog: * g++.dg/ext/is_array.C: Remove testsuite_tr1.h. Add necessary definitions accordingly. Tweak macros for consistency across test codes. * g++.dg/ext/is_bounded_array.C: Likewise. * g++.dg/ext/is_function.C: Likewise. * g++.dg/ext/is_member_function_pointer.C: Likewise. * g++.dg/ext/is_member_object_pointer.C: Likewise. * g++.dg/ext/is_member_pointer.C: Likewise. * g++.dg/ext/is_object.C: Likewise. * g++.dg/ext/is_reference.C: Likewise. * g++.dg/ext/is_scoped_enum.C: Likewise. Signed-off-by: Ken Matsui --- gcc/testsuite/g++.dg/ext/is_array.C | 15 ++++--- gcc/testsuite/g++.dg/ext/is_bounded_array.C | 20 ++++----- gcc/testsuite/g++.dg/ext/is_function.C | 41 +++++++++++-------- .../g++.dg/ext/is_member_function_pointer.C | 14 +++---- .../g++.dg/ext/is_member_object_pointer.C | 26 ++++++------ gcc/testsuite/g++.dg/ext/is_member_pointer.C | 29 ++++++------- gcc/testsuite/g++.dg/ext/is_object.C | 21 ++++------ gcc/testsuite/g++.dg/ext/is_reference.C | 28 +++++++------ gcc/testsuite/g++.dg/ext/is_scoped_enum.C | 12 ++---- 9 files changed, 101 insertions(+), 105 deletions(-) diff --git a/gcc/testsuite/g++.dg/ext/is_array.C b/gcc/testsuite/g++.dg/ext/is_array.C index facfed5c7cb..f1a6e08b87a 100644 --- a/gcc/testsuite/g++.dg/ext/is_array.C +++ b/gcc/testsuite/g++.dg/ext/is_array.C @@ -1,15 +1,14 @@ // { dg-do compile { target c++11 } } -#include +#define SA(X) static_assert((X),#X) -using namespace __gnu_test; +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(const volatile TYPE) == EXPECT) -#define SA(X) static_assert((X),#X) -#define SA_TEST_CATEGORY(TRAIT, X, expect) \ - SA(TRAIT(X) == expect); \ - SA(TRAIT(const X) == expect); \ - SA(TRAIT(volatile X) == expect); \ - SA(TRAIT(const volatile X) == expect) +class ClassType { }; SA_TEST_CATEGORY(__is_array, int[2], true); SA_TEST_CATEGORY(__is_array, int[], true); diff --git a/gcc/testsuite/g++.dg/ext/is_bounded_array.C b/gcc/testsuite/g++.dg/ext/is_bounded_array.C index 346790eba12..b5fe435de95 100644 --- a/gcc/testsuite/g++.dg/ext/is_bounded_array.C +++ b/gcc/testsuite/g++.dg/ext/is_bounded_array.C @@ -1,21 +1,19 @@ // { dg-do compile { target c++11 } } -#include - -using namespace __gnu_test; - #define SA(X) static_assert((X),#X) -#define SA_TEST_CONST(TRAIT, TYPE, EXPECT) \ +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT) + SA(TRAIT(const TYPE) == EXPECT); #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT); \ - SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) +class ClassType { }; + SA_TEST_CATEGORY(__is_bounded_array, int[2], true); SA_TEST_CATEGORY(__is_bounded_array, int[], false); SA_TEST_CATEGORY(__is_bounded_array, int[2][3], true); @@ -31,8 +29,8 @@ SA_TEST_CATEGORY(__is_bounded_array, ClassType[][3], false); SA_TEST_CATEGORY(__is_bounded_array, int(*)[2], false); SA_TEST_CATEGORY(__is_bounded_array, int(*)[], false); SA_TEST_CATEGORY(__is_bounded_array, int(&)[2], false); -SA_TEST_CONST(__is_bounded_array, int(&)[], false); +SA_TEST_FN(__is_bounded_array, int(&)[], false); // Sanity check. SA_TEST_CATEGORY(__is_bounded_array, ClassType, false); -SA_TEST_CONST(__is_bounded_array, void(), false); +SA_TEST_FN(__is_bounded_array, void(), false); diff --git a/gcc/testsuite/g++.dg/ext/is_function.C b/gcc/testsuite/g++.dg/ext/is_function.C index 2e1594b12ad..1fc3c96df1f 100644 --- a/gcc/testsuite/g++.dg/ext/is_function.C +++ b/gcc/testsuite/g++.dg/ext/is_function.C @@ -1,16 +1,19 @@ // { dg-do compile { target c++11 } } -#include +#define SA(X) static_assert((X),#X) -using namespace __gnu_test; +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); -#define SA(X) static_assert((X),#X) #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT); \ - SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) +class ClassType { }; + struct A { void fn(); }; @@ -22,15 +25,15 @@ struct AHolder { using type = U; }; // Positive tests. -SA(__is_function(int (int))); -SA(__is_function(ClassType (ClassType))); -SA(__is_function(float (int, float, int[], int&))); -SA(__is_function(int (int, ...))); -SA(__is_function(bool (ClassType) const)); -SA(__is_function(AHolder::type)); +SA_TEST_FN(__is_function, int (int), true); +SA_TEST_FN(__is_function, ClassType (ClassType), true); +SA_TEST_FN(__is_function, float (int, float, int[], int&), true); +SA_TEST_FN(__is_function, int (int, ...), true); +SA_TEST_FN(__is_function, bool (ClassType) const, true); +SA_TEST_FN(__is_function, AHolder::type, true); void fn(); -SA(__is_function(decltype(fn))); +SA_TEST_FN(__is_function, decltype(fn), true); // Negative tests. SA_TEST_CATEGORY(__is_function, int, false); @@ -39,11 +42,15 @@ SA_TEST_CATEGORY(__is_function, int&, false); SA_TEST_CATEGORY(__is_function, void, false); SA_TEST_CATEGORY(__is_function, void*, false); SA_TEST_CATEGORY(__is_function, void**, false); -SA_TEST_CATEGORY(__is_function, std::nullptr_t, false); +SA_TEST_CATEGORY(__is_function, decltype(nullptr), false); +class AbstractClass +{ + virtual void rotate(int) = 0; +}; SA_TEST_CATEGORY(__is_function, AbstractClass, false); -SA(!__is_function(int(&)(int))); -SA(!__is_function(int(*)(int))); +SA_TEST_FN(__is_function, int(&)(int), false); +SA_TEST_FN(__is_function, int(*)(int), false); SA_TEST_CATEGORY(__is_function, A, false); SA_TEST_CATEGORY(__is_function, decltype(&A::fn), false); @@ -53,6 +60,8 @@ struct FnCallOverload SA_TEST_CATEGORY(__is_function, FnCallOverload, false); // Sanity check. +class IncompleteClass; +union IncompleteUnion; SA_TEST_CATEGORY(__is_function, ClassType, false); SA_TEST_CATEGORY(__is_function, IncompleteClass, false); SA_TEST_CATEGORY(__is_function, IncompleteUnion, false); diff --git a/gcc/testsuite/g++.dg/ext/is_member_function_pointer.C b/gcc/testsuite/g++.dg/ext/is_member_function_pointer.C index 555123e8f07..4435a65d1a1 100644 --- a/gcc/testsuite/g++.dg/ext/is_member_function_pointer.C +++ b/gcc/testsuite/g++.dg/ext/is_member_function_pointer.C @@ -1,21 +1,19 @@ // { dg-do compile { target c++11 } } -#include - -using namespace __gnu_test; - #define SA(X) static_assert((X),#X) -#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ SA(TRAIT(TYPE) == EXPECT); \ SA(TRAIT(const TYPE) == EXPECT); #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT); \ - SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) +class ClassType { }; + // Positive tests. SA_TEST_FN(__is_member_function_pointer, int (ClassType::*) (int), true); SA_TEST_FN(__is_member_function_pointer, int (ClassType::*) (int) const, true); diff --git a/gcc/testsuite/g++.dg/ext/is_member_object_pointer.C b/gcc/testsuite/g++.dg/ext/is_member_object_pointer.C index 835e48c8f8e..2d01febe9d4 100644 --- a/gcc/testsuite/g++.dg/ext/is_member_object_pointer.C +++ b/gcc/testsuite/g++.dg/ext/is_member_object_pointer.C @@ -1,30 +1,28 @@ // { dg-do compile { target c++11 } } -#include - -using namespace __gnu_test; - #define SA(X) static_assert((X),#X) -#define SA_TEST_NON_VOLATILE(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT) +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT); \ - SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) +class ClassType { }; + // Positive tests. SA_TEST_CATEGORY(__is_member_object_pointer, int (ClassType::*), true); SA_TEST_CATEGORY(__is_member_object_pointer, ClassType (ClassType::*), true); // Negative tests. -SA_TEST_NON_VOLATILE(__is_member_object_pointer, int (ClassType::*) (int), false); -SA_TEST_NON_VOLATILE(__is_member_object_pointer, int (ClassType::*) (float, ...), false); -SA_TEST_NON_VOLATILE(__is_member_object_pointer, ClassType (ClassType::*) (ClassType), false); -SA_TEST_NON_VOLATILE(__is_member_object_pointer, float (ClassType::*) (int, float, int[], int&), false); +SA_TEST_FN(__is_member_object_pointer, int (ClassType::*) (int), false); +SA_TEST_FN(__is_member_object_pointer, int (ClassType::*) (float, ...), false); +SA_TEST_FN(__is_member_object_pointer, ClassType (ClassType::*) (ClassType), false); +SA_TEST_FN(__is_member_object_pointer, float (ClassType::*) (int, float, int[], int&), false); // Sanity check. SA_TEST_CATEGORY(__is_member_object_pointer, ClassType, false); diff --git a/gcc/testsuite/g++.dg/ext/is_member_pointer.C b/gcc/testsuite/g++.dg/ext/is_member_pointer.C index 7ee2e3ab90c..c6ecbe3eee1 100644 --- a/gcc/testsuite/g++.dg/ext/is_member_pointer.C +++ b/gcc/testsuite/g++.dg/ext/is_member_pointer.C @@ -1,30 +1,27 @@ // { dg-do compile { target c++11 } } -#include - -using namespace __gnu_test; - #define SA(X) static_assert((X),#X) -#define SA_TEST_NON_VOLATILE(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT) +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT); \ - SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) +class ClassType { }; + SA_TEST_CATEGORY(__is_member_pointer, int (ClassType::*), true); SA_TEST_CATEGORY(__is_member_pointer, ClassType (ClassType::*), true); -SA_TEST_NON_VOLATILE(__is_member_pointer, int (ClassType::*)(int), true); -SA_TEST_NON_VOLATILE(__is_member_pointer, int (ClassType::*)(int) const, true); -SA_TEST_NON_VOLATILE(__is_member_pointer, int (ClassType::*)(float, ...), true); -SA_TEST_NON_VOLATILE(__is_member_pointer, ClassType (ClassType::*)(ClassType), true); -SA_TEST_NON_VOLATILE(__is_member_pointer, - float (ClassType::*)(int, float, int[], int&), true); +SA_TEST_FN(__is_member_pointer, int (ClassType::*)(int), true); +SA_TEST_FN(__is_member_pointer, int (ClassType::*)(int) const, true); +SA_TEST_FN(__is_member_pointer, int (ClassType::*)(float, ...), true); +SA_TEST_FN(__is_member_pointer, ClassType (ClassType::*)(ClassType), true); +SA_TEST_FN(__is_member_pointer, float (ClassType::*)(int, float, int[], int&), true); // Sanity check. SA_TEST_CATEGORY(__is_member_pointer, ClassType, false); diff --git a/gcc/testsuite/g++.dg/ext/is_object.C b/gcc/testsuite/g++.dg/ext/is_object.C index 5c759a5ef69..7e66b6a85a3 100644 --- a/gcc/testsuite/g++.dg/ext/is_object.C +++ b/gcc/testsuite/g++.dg/ext/is_object.C @@ -1,14 +1,10 @@ // { dg-do compile { target c++11 } } -#include - -using namespace __gnu_test; - #define SA(X) static_assert((X),#X) -#define SA_TEST_NON_VOLATILE(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT) +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ SA(TRAIT(TYPE) == EXPECT); \ @@ -16,13 +12,14 @@ using namespace __gnu_test; SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) -SA_TEST_NON_VOLATILE(__is_object, int (int), false); -SA_TEST_NON_VOLATILE(__is_object, ClassType (ClassType), false); -SA_TEST_NON_VOLATILE(__is_object, - float (int, float, int[], int&), false); +class ClassType { }; + +SA_TEST_FN(__is_object, int (int), false); +SA_TEST_FN(__is_object, ClassType (ClassType), false); +SA_TEST_FN(__is_object, float (int, float, int[], int&), false); SA_TEST_CATEGORY(__is_object, int&, false); SA_TEST_CATEGORY(__is_object, ClassType&, false); -SA_TEST_NON_VOLATILE(__is_object, int(&)(int), false); +SA_TEST_FN(__is_object, int(&)(int), false); SA_TEST_CATEGORY(__is_object, void, false); // Sanity check. diff --git a/gcc/testsuite/g++.dg/ext/is_reference.C b/gcc/testsuite/g++.dg/ext/is_reference.C index b5ce4db7afd..88dd3bfc1b5 100644 --- a/gcc/testsuite/g++.dg/ext/is_reference.C +++ b/gcc/testsuite/g++.dg/ext/is_reference.C @@ -1,33 +1,37 @@ // { dg-do compile { target c++11 } } -#include +#define SA(X) static_assert((X),#X) -using namespace __gnu_test; +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); -#define SA(X) static_assert((X),#X) #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT); \ - SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) +class ClassType { }; +class IncompleteClass; + // Positive tests. SA_TEST_CATEGORY(__is_reference, int&, true); SA_TEST_CATEGORY(__is_reference, ClassType&, true); -SA(__is_reference(int(&)(int))); +SA_TEST_FN(__is_reference, int(&)(int), true); SA_TEST_CATEGORY(__is_reference, int&&, true); SA_TEST_CATEGORY(__is_reference, ClassType&&, true); -SA(__is_reference(int(&&)(int))); +SA_TEST_FN(__is_reference, int(&&)(int), true); SA_TEST_CATEGORY(__is_reference, IncompleteClass&, true); // Negative tests SA_TEST_CATEGORY(__is_reference, void, false); SA_TEST_CATEGORY(__is_reference, int*, false); SA_TEST_CATEGORY(__is_reference, int[3], false); -SA(!__is_reference(int(int))); -SA(!__is_reference(int(*const)(int))); -SA(!__is_reference(int(*volatile)(int))); -SA(!__is_reference(int(*const volatile)(int))); +SA_TEST_FN(__is_reference, int(int), false); +SA_TEST_FN(__is_reference, int(*const)(int), false); +SA_TEST_FN(__is_reference, int(*volatile)(int), false); +SA_TEST_FN(__is_reference, int(*const volatile)(int), false); // Sanity check. SA_TEST_CATEGORY(__is_reference, ClassType, false); diff --git a/gcc/testsuite/g++.dg/ext/is_scoped_enum.C b/gcc/testsuite/g++.dg/ext/is_scoped_enum.C index a563b6ee67d..fdf36c68fe9 100644 --- a/gcc/testsuite/g++.dg/ext/is_scoped_enum.C +++ b/gcc/testsuite/g++.dg/ext/is_scoped_enum.C @@ -1,19 +1,15 @@ // { dg-do compile { target c++11 } } -#include - -using namespace __gnu_test; - #define SA(X) static_assert((X),#X) -#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ +#define SA_TEST_FN(TRAIT, TYPE, EXPECT) \ SA(TRAIT(TYPE) == EXPECT); \ SA(TRAIT(const TYPE) == EXPECT); #define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ - SA(TRAIT(TYPE) == EXPECT); \ - SA(TRAIT(const TYPE) == EXPECT); \ - SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ SA(TRAIT(const volatile TYPE) == EXPECT) enum class E { e1, e2 };