From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 859C83858404 for ; Thu, 21 Dec 2023 13:29:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 859C83858404 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 859C83858404 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703165374; cv=none; b=elFJdUPIpkx0SYAb1WigvbPnYXLtqg/saQI2r0htbyOA4MYOTmAM7UxwpslKGipf+0nXMb/IX7V6aFjCU+B4V48JlLG+3HHNV1GtTDtc3U/rlhYLYdd42/kJAv/n2GG5Z/NisU2pK5NQ8LkdbZV0Zj1btho5qcDrXFpX9nP0mP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703165374; c=relaxed/simple; bh=s5Y4P2a3zScS44UcHbcH3XGS4OZQBEnWBL4zUQK81Js=; h=DKIM-Signature:From:Date:To:Subject:Message-ID:MIME-Version; b=kB74mEWZ7yGD7grvwfyWGRLBStAZMRZ/kK+m0L5b0MMKht5y/rVIAOR9qWTnsXmw4HOTxOrgxcnVs2AlzlNjA704D/QCKlp9hzm6xY3xswODRcpGW/REjYwPXrNtlTJAtNpsr7gwIxTSWLMqPHzEAcVzyVvoj09DkAySPNe0XG0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703165371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NPpSkU0TcpVlp24MXFLKOl1bDVWTYBGFW6RpmCXXg10=; b=BnKI1kStnBXkZJXZbNYP6BPSFMtuUN0X/kPECaAmIoQoTRxPRQwr0dnRrIqUrpIA9Gbk9v 2Yg+Xlv5HpEyUyI8XOr0czzJnU+59RUn4bBfMPNhKrc+LeyOKUeKH4vkYNKG7vuCMhQ9sp jrSTEUCzI/4SOyC1PwgZRQ6xhn2N65g= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-67-plentNchO26zX6SxOXFZ7Q-1; Thu, 21 Dec 2023 08:29:29 -0500 X-MC-Unique: plentNchO26zX6SxOXFZ7Q-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-67f84adbc1fso6470496d6.3 for ; Thu, 21 Dec 2023 05:29:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703165369; x=1703770169; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NPpSkU0TcpVlp24MXFLKOl1bDVWTYBGFW6RpmCXXg10=; b=xPxoWngHmk4ZchM8YFqAcxzqhp3cjZfKaGcFwwdBqcLuuAQjxiMHtYjjxyymb9WZgU nHfP4+m4tDyGX+zja75ftZlalTgaOAbVTPpxkDqRqPEqt2Q5jzRZiRB3qIwX1PvxhNPO f6ipjERn2YHlbW6BwK7hy80qvcHjxW6RLMMZFmpSVLgRnViCpqqtxjqwxQpgJIZrqpYO sOVKb5AYg/0AOuPCv82zNFBqzvAiwO20k14O1oHAYyfahjm5Tp/v6yCcgN505rgIoTbM 53I5ydNpXSrof3eW3/sW93wKLEZ5/vtnW8H9FAO5DAuNTQ9GEEZNDEzUHSge0AM36L10 ZpMw== X-Gm-Message-State: AOJu0YyIV/rWk1dsDsGHoMprqNgPKihgztCI/Gc61zmUq0sBmnTN25Ne h5AQcMvI7snDePcvAHoECeEW9oDj14r58n4a7Df7pbJVzoc+/nEn2UWHC0IUJPAOZXA821tdmzH 6zzdcQr6dyxaX0OC07A== X-Received: by 2002:ad4:5d4c:0:b0:67f:2385:7e07 with SMTP id jk12-20020ad45d4c000000b0067f23857e07mr15040667qvb.58.1703165369258; Thu, 21 Dec 2023 05:29:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IEwO8dCbYXdyoZy03IxUemWuSVwmUmY246RrMwkbtg9cK8QVY3fYTi/k5cY8Juwh9S0R56IEQ== X-Received: by 2002:ad4:5d4c:0:b0:67f:2385:7e07 with SMTP id jk12-20020ad45d4c000000b0067f23857e07mr15040659qvb.58.1703165368941; Thu, 21 Dec 2023 05:29:28 -0800 (PST) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id e4-20020ad450c4000000b0067f80beb08fsm503300qvq.67.2023.12.21.05.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 05:29:28 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Thu, 21 Dec 2023 08:29:27 -0500 (EST) To: Ken Matsui cc: gcc-patches@gcc.gnu.org, jason@redhat.com Subject: Re: [PATCH] testsuite: Remove testsuite_tr1.h In-Reply-To: <20231220190824.399818-1-kmatsui@gcc.gnu.org> Message-ID: References: <20231220190824.399818-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,SPF_HELO_NONE,SPF_NONE,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 List-Id: On Wed, 20 Dec 2023, Ken Matsui wrote: > 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. LGTM > > 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 }; > -- > 2.43.0 > >