From patchwork Fri Dec 22 10:05:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 182608 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp957393dyi; Fri, 22 Dec 2023 02:07:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXvd7h+boZXXjzuUy2WgnvyPGj/XBltyq7kqUDBr+GWePL1EzLu6yYlEGrnMiMP+X1vArJ X-Received: by 2002:a05:6214:19e9:b0:67a:c1a7:c5f8 with SMTP id q9-20020a05621419e900b0067ac1a7c5f8mr1440543qvc.16.1703239663508; Fri, 22 Dec 2023 02:07:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1703239663; cv=pass; d=google.com; s=arc-20160816; b=ew7NJu31oWtZ+w9K5q1MMZJEZiy1Q8//K375/d4QYeiFxKLhAceMBJBItlFGKcYCP6 yLemV95xJfLpbUwM3qHYk7PiimGeO0PxfhJDBWTF/TrlAkTTbALD6ZunLK/HwpqlPYeQ 4kADXMQLZvIlQfYs/YwjQcXS22z4lamaLDDx9F0FEu+aJsh0jq6KXuD8dKJh5a2W+HdO I4/sm18d57fu+lvRup5n7UeaBVd4jAG92cxmpg29dDN2gYnSWdeqiJheu0XiFoYPn+j/ TsNTgq6FMf3lDDnnGLlB5fhV0YSuv2+C//LkNwIeQ9+Aok14ii5jYQUQ2dzdoIZHiP05 gtGw== 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=2ssTIA0n4XYcgRDVncsmw1ElJSX1i/vt+yD2LgTeS/o=; fh=YrJbFXRZwPJa+2n8zRy9zRZfaghGlFnOHr8R/lcWPhA=; b=Pham52HMVvDO+48ku5uIYJ0Aj2+YoyDNikvMZ5CMSTIaEtKySRwRyw0ZjYqd+U5g1N TcZT8wI3xjbHZte6nHOl2xR19FpM9EvTdYXrsmEHYP06x1uQEGuTom8CupO7VjwGHpvJ ZwtVpXrS6PQre5FJ8AG2pdcGnCs1Vqkal4zl0yMHX33ZEZGaEb61t9Ujjxb7JI3sVRya EIIE+xA+be0uIpCun4kdFXO/8nFtNDtbZ9VloF+Q+umIbFVgt9M8Xub2kNOHeTYt9CQa vP7zEJI+/VVKbGZMvLvOY2DyhEEs1WSbAvu0ZW0lmif3SPp+OYnVNMCO954yJn3WEExi J1XQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lq2dT6Gx; 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 j15-20020a0cf50f000000b0067f3c4b6deesi4144035qvm.261.2023.12.22.02.07.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 02:07:43 -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=lq2dT6Gx; 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 301F23858C66 for ; Fri, 22 Dec 2023 10:07:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 301F23858C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1703239663; bh=2ssTIA0n4XYcgRDVncsmw1ElJSX1i/vt+yD2LgTeS/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lq2dT6Gx+j356vQdUZ0Ev1gMXw34w+VRivo4hMPpvtScHdYG6SXigUC+2go9Oja1k Hm9Mf7bmry1LP7MkQfikaluo349wuZUt35m65iATANFopU5RN3s5a406N1CS0KRXUA GtJrSFpCfJbyMYfidQBIinT8fbzayYXiMn38wHCQ= 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 ECBFC3858D3C; Fri, 22 Dec 2023 10:06:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ECBFC3858D3C 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 ECBFC3858D3C 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=1703239617; cv=none; b=vCsW0+iI+d9vTosN1HFyd6mWcJWzrqnDh+QNvQu6TCcIEl3eu3qEfavrPdlA5VPT1HVx6VVbYNk1tJyVSUhr/kT2UXJsv0fs/WxLH/jpz3ZypjjW5abbcYU8tOjYuUgxgMRDrW7SxjybbExjHBc2HEsVM+KwCZKv0ZcJZ86K3Fw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703239617; c=relaxed/simple; bh=aVGELUgqjfAm6YHTaMU84Jep3Z58EqZDryF/QUeJYL0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=byd4Vv5znUZ7XbXzN0cPTLRXLm7lr7gpjKmZ4pAnlXBMbk5B0oGMD7nqbQTExV0jekxa5nNsAC/pCkqoakcLV7lJtriQx6Ccb9XaH+fKnYricNv/E/ePc0S8RTwDGbOr7fQ0T9dy6MVe+U7gRMaAO9uw73okXMAWm/vBaNmSrBI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247470.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BMA61OF015929; Fri, 22 Dec 2023 10:06:52 GMT Received: from mxout26.s.uw.edu (mxout26.s.uw.edu [140.142.234.176]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3v50q6hkj8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Dec 2023 10:06:52 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.132]) by mxout26.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 3BMA5utQ032651 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Dec 2023 02:05:56 -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 3BMA5tNn008377 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Dec 2023 02:05:56 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: sandra@codesourcery.com, Ken Matsui , Patrick Palka , Jason Merrill Subject: [committed] c++: testsuite: Remove testsuite_tr1.h includes Date: Fri, 22 Dec 2023 02:05:47 -0800 Message-ID: <20231222100547.454123-1-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: iUru6Ja6IZrInCQnqTV1H7YgkYAC6wyD X-Proofpoint-ORIG-GUID: iUru6Ja6IZrInCQnqTV1H7YgkYAC6wyD 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-22_05,2023-12-21_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 adultscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 clxscore=1034 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312220072 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, 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: 1785976233125225876 X-GMAIL-MSGID: 1785976233125225876 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. For the record this fixes the test failures reported at https://gcc.gnu.org/pipermail/gcc-patches/2023-December/641058.html 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 Reviewed-by: Patrick Palka Reviewed-by: Jason Merrill --- 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 };