Skip to content

Commit 6a9715c

Browse files
ldionnemahesh-attarde
authored andcommitted
[libc++] Remove mentions of Clang 18 in the test suite (llvm#148862)
Clang 19 has been the oldest supported version of Clang since the LLVM 20 release, but we had not cleaned up the test suite yet.
1 parent 5a0546a commit 6a9715c

File tree

16 files changed

+21
-57
lines changed

16 files changed

+21
-57
lines changed

libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// Clang-18 fixed some spurious clang diagnostics. Once clang-18 is the
10-
// minimum required version these obsolete tests can be removed.
11-
// TODO(LLVM-20) remove spurious clang diagnostic tests.
12-
139
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
1410

1511
// With clang-cl, some warnings have a 'which is a Microsoft extension' suffix
@@ -59,12 +55,12 @@ void test() {
5955
{
6056
std::expected<int, int> e;
6157
e.transform_error(return_unexpected<int&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
62-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
58+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
6359
// expected-error-re@*:* {{static assertion failed {{.*}}[expected.object.general] A program that instantiates the definition of template expected<T, E> for {{.*}} is ill-formed.}}
6460
// expected-error-re@*:* 0-1 {{union member {{.*}} has reference type {{.*}}}}
6561

6662
e.transform_error(return_no_object<int&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
67-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
63+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
6864
// expected-error-re@*:* {{static assertion failed {{.*}}[expected.object.general] A program that instantiates the definition of template expected<T, E> for {{.*}} is ill-formed.}}
6965
// expected-warning-re@*:* 0-1 {{union member {{.*}} has reference type {{.*}}, which is a Microsoft extension}}
7066
}
@@ -73,27 +69,27 @@ void test() {
7369
{
7470
const std::expected<int, int> e;
7571
e.transform_error(return_unexpected<const int &>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
76-
// expected-error-re@*:* 0-2 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
72+
// expected-error-re@*:* 0-2 {{no matching constructor for initialization of{{.*}}}}
7773
e.transform_error(return_no_object<const int &>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
78-
// expected-error-re@*:* 0-2 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
74+
// expected-error-re@*:* 0-2 {{no matching constructor for initialization of{{.*}}}}
7975
}
8076

8177
// Test && overload
8278
{
8379
std::expected<int, int> e;
8480
std::move(e).transform_error(return_unexpected<int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
85-
// expected-error-re@*:* 0-2 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
81+
// expected-error-re@*:* 0-2 {{no matching constructor for initialization of{{.*}}}}
8682
std::move(e).transform_error(return_no_object<int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
87-
// expected-error-re@*:* 0-2 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
83+
// expected-error-re@*:* 0-2 {{no matching constructor for initialization of{{.*}}}}
8884
}
8985

9086
// Test const&& overload
9187
{
9288
const std::expected<int, int> e;
9389
std::move(e).transform_error(return_unexpected<const int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
94-
// expected-error-re@*:* 0-2 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
90+
// expected-error-re@*:* 0-2 {{no matching constructor for initialization of{{.*}}}}
9591
std::move(e).transform_error(return_no_object<const int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
96-
// expected-error-re@*:* 0-2 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
92+
// expected-error-re@*:* 0-2 {{no matching constructor for initialization of{{.*}}}}
9793
}
9894
}
9995
// clang-format on

libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// Clang-18 fixed some spurious clang diagnostics. Once clang-18 is the
10-
// minumum required version these obsolete tests can be removed.
11-
// TODO(LLVM-20) remove spurious clang diagnostic tests.
12-
139
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
1410

1511
// With clang-cl, some warnings have a 'which is a Microsoft extension' suffix
@@ -60,13 +56,13 @@ void test() {
6056
{
6157
std::expected<void, int> e;
6258
e.transform_error(return_unexpected<int&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
63-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
59+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
6460
// expected-error-re@*:* {{static assertion failed {{.*}}A program that instantiates expected<T, E> with a E that is not a valid argument for unexpected<E> is ill-formed}}
6561
// expected-error-re@*:* 0-1 {{call to deleted constructor of {{.*}}}}
6662
// expected-error-re@*:* 0-1 {{union member {{.*}} has reference type {{.*}}}}
6763

6864
e.transform_error(return_no_object<int&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
69-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
65+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
7066
// expected-error-re@*:* {{static assertion failed {{.*}}A program that instantiates expected<T, E> with a E that is not a valid argument for unexpected<E> is ill-formed}}
7167
// expected-warning-re@*:* 0-1 {{union member {{.*}} has reference type {{.*}}, which is a Microsoft extension}}
7268
}
@@ -75,28 +71,28 @@ void test() {
7571
{
7672
const std::expected<void, int> e;
7773
e.transform_error(return_unexpected<const int &>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
78-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
74+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
7975
e.transform_error(return_no_object<const int &>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
80-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
76+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
8177
// expected-error-re@*:* 0-1 {{call to deleted constructor of {{.*}}}}
8278
}
8379

8480
// Test && overload
8581
{
8682
std::expected<void, int> e;
8783
std::move(e).transform_error(return_unexpected<int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
88-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
84+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
8985
std::move(e).transform_error(return_no_object<int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
90-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
86+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
9187
}
9288

9389
// Test const&& overload
9490
{
9591
const std::expected<void, int> e;
9692
std::move(e).transform_error(return_unexpected<const int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
97-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
93+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
9894
std::move(e).transform_error(return_no_object<const int&&>); // expected-error-re@*:* {{static assertion failed {{.*}}The result of {{.*}} must be a valid template argument for unexpected}}
99-
// expected-error-re@*:* 0-1 {{{{(excess elements in struct initializer|no matching constructor for initialization of)}}{{.*}}}}
95+
// expected-error-re@*:* 0-1 {{no matching constructor for initialization of{{.*}}}}
10096
}
10197
}
10298
// clang-format on

libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_add.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
// UNSUPPORTED: c++03, c++11, c++14, c++17
99
// XFAIL: !has-64-bit-atomics
1010

11-
// Older versions of clang have a bug with atomic builtins affecting double and long double.
12-
// Fixed by 5fdd0948.
13-
// XFAIL: target=powerpc-ibm-{{.*}} && clang-18
14-
1511
// https://github.com/llvm/llvm-project/issues/72893
1612
// XFAIL: target={{x86_64-.*}} && tsan
1713

libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_sub.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
// UNSUPPORTED: c++03, c++11, c++14, c++17
99
// XFAIL: !has-64-bit-atomics
1010

11-
// Older versions of clang have a bug with atomic builtins affecting double and long double.
12-
// Fixed by 5fdd0948.
13-
// XFAIL: target=powerpc-ibm-{{.*}} && clang-18
14-
1511
// https://github.com/llvm/llvm-project/issues/72893
1612
// XFAIL: target={{x86_64-.*}} && tsan
1713

libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.minus_equals.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
// UNSUPPORTED: c++03, c++11, c++14, c++17
99
// XFAIL: !has-64-bit-atomics
1010

11-
// Older versions of clang have a bug with atomic builtins affecting double and long double.
12-
// Fixed by 5fdd0948.
13-
// XFAIL: target=powerpc-ibm-{{.*}} && clang-18
14-
1511
// floating-point-type operator-=(floating-point-type) volatile noexcept;
1612
// floating-point-type operator-=(floating-point-type) noexcept;
1713

libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.plus_equals.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
// UNSUPPORTED: c++03, c++11, c++14, c++17
99
// XFAIL: !has-64-bit-atomics
1010

11-
// Older versions of clang have a bug with atomic builtins affecting double and long double.
12-
// Fixed by 5fdd0948.
13-
// XFAIL: target=powerpc-ibm-{{.*}} && clang-18
14-
1511
// floating-point-type operator+=(floating-point-type) volatile noexcept;
1612
// floating-point-type operator+=(floating-point-type) noexcept;
1713

libcxx/test/std/experimental/simd/simd.class/simd_copy.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
// UNSUPPORTED: c++03, c++11, c++14
1010

11-
// Older versions of clang may encounter a backend error (see 0295c2ad):
12-
// Pass-by-value arguments with alignment greater than register width are not supported.
13-
// XFAIL: target=powerpc{{.*}}-ibm-{{.*}} && clang-18
14-
1511
// <experimental/simd>
1612
//
1713
// [simd.class]

libcxx/test/std/experimental/simd/simd.class/simd_unary.pass.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
// UNSUPPORTED: c++03, c++11, c++14
1010

11-
// Older versions of clang may encounter a backend error (see 0295c2ad):
12-
// Pass-by-value arguments with alignment greater than register width are not supported.
13-
// XFAIL: target=powerpc{{.*}}-ibm-{{.*}} && clang-18
14-
1511
// FIXME: The following issue occurs on Windows to Armv7 Ubuntu Linux:
1612
// Assertion failed: N->getValueType(0) == MVT::v1i1 && "Expected v1i1 type"
1713
// XFAIL: target=armv7-unknown-linux-gnueabihf

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// UNSUPPORTED: c++03, c++11
1212

1313
// These compiler versions and platforms don't enable sized deallocation by default.
14-
// ADDITIONAL_COMPILE_FLAGS(clang-18): -fsized-deallocation
1514
// ADDITIONAL_COMPILE_FLAGS(apple-clang-16): -fsized-deallocation
1615
// ADDITIONAL_COMPILE_FLAGS(apple-clang-17): -fsized-deallocation
1716
// ADDITIONAL_COMPILE_FLAGS(target=x86_64-w64-windows-gnu): -fsized-deallocation

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// UNSUPPORTED: c++03, c++11
1212

1313
// These compiler versions and platforms don't enable sized deallocation by default.
14-
// ADDITIONAL_COMPILE_FLAGS(clang-18): -fsized-deallocation
1514
// ADDITIONAL_COMPILE_FLAGS(apple-clang-16): -fsized-deallocation
1615
// ADDITIONAL_COMPILE_FLAGS(apple-clang-17): -fsized-deallocation
1716
// ADDITIONAL_COMPILE_FLAGS(target=x86_64-w64-windows-gnu): -fsized-deallocation

0 commit comments

Comments
 (0)