Skip to content

Commit

Permalink
c++: testsuite: Remove testsuite_tr1.h includes
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Reviewed-by: Patrick Palka <[email protected]>
Reviewed-by: Jason Merrill <[email protected]>
  • Loading branch information
@ken-matsui
ken-matsui committed Dec 22, 2023
1 parent 5bd5ef9 commit c4d1d1a
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 105 deletions.
15 changes: 7 additions & 8 deletions gcc/testsuite/g++.dg/ext/is_array.C
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>
#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);
Expand Down
20 changes: 9 additions & 11 deletions gcc/testsuite/g++.dg/ext/is_bounded_array.C
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>

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);
Expand All @@ -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);
41 changes: 25 additions & 16 deletions gcc/testsuite/g++.dg/ext/is_function.C
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>
#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(); };

Expand All @@ -22,15 +25,15 @@ struct AHolder<U T::*>
{ 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<decltype(&A::fn)>::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<decltype(&A::fn)>::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);
Expand All @@ -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);
Expand All @@ -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);
14 changes: 6 additions & 8 deletions gcc/testsuite/g++.dg/ext/is_member_function_pointer.C
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>

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);
Expand Down
26 changes: 12 additions & 14 deletions gcc/testsuite/g++.dg/ext/is_member_object_pointer.C
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>

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);
29 changes: 13 additions & 16 deletions gcc/testsuite/g++.dg/ext/is_member_pointer.C
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>

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);
21 changes: 9 additions & 12 deletions gcc/testsuite/g++.dg/ext/is_object.C
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>

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(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.
Expand Down
28 changes: 16 additions & 12 deletions gcc/testsuite/g++.dg/ext/is_reference.C
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>
#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);
Expand Down
12 changes: 4 additions & 8 deletions gcc/testsuite/g++.dg/ext/is_scoped_enum.C
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
// { dg-do compile { target c++11 } }

#include <testsuite_tr1.h>

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 };
Expand Down

0 comments on commit c4d1d1a

Please sign in to comment.