[libc++][C++03] Remove code in the C++03-specific tests that is guarded on the language version #169354
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ed on the language version
You can test this locally with the following command:git-clang-format --diff origin/main HEAD --extensions h,cpp -- libcxx/test/libcxx-03/algorithms/half_positive.pass.cpp libcxx/test/libcxx-03/algorithms/robust_against_copying_comparators.pass.cpp libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp libcxx/test/libcxx-03/containers/sequences/vector/asan.pass.cpp libcxx/test/libcxx-03/containers/sequences/vector/asan_throw.pass.cpp libcxx/test/libcxx-03/depr/depr.default.allocator/allocator.members/construct.cxx20.pass.cpp libcxx/test/libcxx-03/input.output/string.streams/stringbuf/const_sso_buffer.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/arithmetic.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/comparison.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/pointer_traits.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/types.compile.pass.cpp libcxx/test/libcxx-03/iterators/contiguous_iterators.conv.compile.pass.cpp libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp libcxx/test/libcxx-03/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/get_container.pass.cpp libcxx/test/libcxx-03/iterators/unwrap_iter.pass.cpp libcxx/test/libcxx-03/language.support/support.dynamic/libcpp_deallocate.sh.cpp libcxx/test/libcxx-03/libcpp_alignof.pass.cpp libcxx/test/libcxx-03/memory/allocation_guard.pass.cpp libcxx/test/libcxx-03/memory/swap_allocator.pass.cpp libcxx/test/libcxx-03/numerics/bit.ops.pass.cpp libcxx/test/libcxx-03/strings/basic.string/string.capacity/max_size.pass.cpp libcxx/test/libcxx-03/strings/basic.string/string.cons/copy_shrunk_long.pass.cpp libcxx/test/libcxx-03/strings/c.strings/constexpr_memmove.pass.cpp libcxx/test/libcxx-03/type_traits/is_trivially_relocatable.compile.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke_helpers.h libcxx/test/libcxx-03/utilities/is_pointer_in_range.pass.cpp libcxx/test/libcxx-03/utilities/is_valid_range.pass.cpp libcxx/test/libcxx-03/utilities/memory/pointer.conversion/to_address.pass.cpp libcxx/test/libcxx-03/utilities/memory/pointer.conversion/to_address_std_iterators.pass.cpp libcxx/test/libcxx-03/utilities/meta/is_referenceable.compile.pass.cpp libcxx/test/libcxx-03/utilities/no_destroy.pass.cpp libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivially_copyable.compile.pass.cpp --diff_from_common_commit
View the diff from clang-format here.diff --git a/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp b/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
index 009a23403..2991112d8 100644
--- a/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
+++ b/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
@@ -98,7 +98,7 @@ void test() {
(void) std::equal_range(it, it, 0);
(void) std::equal_range(it, it, 0, pred);
(void) std::equal(it, it, it);
- (void) std::equal(it, it, it, pred);
+ (void)std::equal(it, it, it, pred);
(void) std::fill_n(it, 0, 0);
(void) std::fill(it, it, 0);
(void) std::find_end(it, it, it, it);
@@ -107,7 +107,7 @@ void test() {
(void) std::find_first_of(it, it, it, it, pred);
(void) std::find_if_not(it, it, pred);
(void) std::find_if(it, it, pred);
- (void) std::find(it, it, 0);
+ (void)std::find(it, it, 0);
(void) std::for_each(it, it, pred);
(void) std::generate_n(it, 0, pred);
(void) std::generate(it, it, pred);
@@ -121,13 +121,13 @@ void test() {
(void) std::is_heap(it, it, pred);
(void) std::is_partitioned(it, it, pred);
(void) std::is_permutation(it, it, it);
- (void) std::is_permutation(it, it, it, pred);
+ (void)std::is_permutation(it, it, it, pred);
(void) std::is_sorted_until(it, it);
(void) std::is_sorted_until(it, it, pred);
(void) std::is_sorted(it, it);
(void) std::is_sorted(it, it, pred);
(void) std::lexicographical_compare(it, it, it, it);
- (void) std::lexicographical_compare(it, it, it, it, pred);
+ (void)std::lexicographical_compare(it, it, it, it, pred);
(void) std::lower_bound(it, it, 0);
(void) std::lower_bound(it, it, 0, pred);
(void) std::make_heap(it, it);
@@ -173,9 +173,9 @@ void test() {
(void) std::reverse_copy(it, it, it);
(void) std::reverse(it, it);
(void) std::rotate_copy(it, it, it, it);
- (void) std::rotate(it, it, it);
+ (void)std::rotate(it, it, it);
(void) std::search(it, it, it, it);
- (void) std::search(it, it, it, it, pred);
+ (void)std::search(it, it, it, it, pred);
(void) std::set_difference(it, it, it, it, it);
(void) std::set_difference(it, it, it, it, it, pred);
(void) std::set_intersection(it, it, it, it, it);
@@ -183,7 +183,7 @@ void test() {
(void) std::set_symmetric_difference(it, it, it, it, it);
(void) std::set_symmetric_difference(it, it, it, it, it, pred);
(void) std::set_union(it, it, it, it, it);
- (void) std::set_union(it, it, it, it, it, pred);
+ (void)std::set_union(it, it, it, it, it, pred);
(void) std::shuffle(it, it, rng);
(void) std::sort_heap(it, it);
(void) std::sort_heap(it, it, pred);
diff --git a/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp b/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp
index 56f12e01f..f54635b76 100644
--- a/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp
+++ b/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp
@@ -115,7 +115,8 @@ int main(int, char**)
static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<const char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<int *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<T *> >::value), "");
- static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<my_random_access_iterator> >::value), "");
+ static_assert(
+ (!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<my_random_access_iterator> >::value), "");
static_assert(( std::__libcpp_is_contiguous_iterator<std::__wrap_iter<char *> >::value), "");
static_assert(( std::__libcpp_is_contiguous_iterator<std::__wrap_iter<const char *> >::value), "");
@@ -133,7 +134,7 @@ int main(int, char**)
static_assert((!std::__libcpp_is_contiguous_iterator<cpp17_input_iterator <char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<forward_iterator <char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<bidirectional_iterator<char *> >::value), "");
- static_assert((!std::__libcpp_is_contiguous_iterator<random_access_iterator<char *> >::value), "");
+ static_assert((!std::__libcpp_is_contiguous_iterator<random_access_iterator<char*> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<ThrowingIterator <char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<NonThrowingIterator <char *> >::value), "");
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
index a88311210..1e67e32a0 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
@@ -89,7 +89,6 @@ private:
MemFun03& operator=(MemFun03 const&);
};
-
//==============================================================================
// TestCase - A test case for a single member function.
// ClassType - The type of the class being tested.
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
index 3a8d141a7..7295acfc9 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
@@ -156,14 +156,12 @@ private:
}
template <class Expect, class Fn, class T>
- void runTest(Fn M, T& obj, ObjectType* expect ) {
- {
- static_assert((std::is_same<
- decltype(std::__invoke(M, std::forward<T>(obj))), Expect
- >::value), "");
- Expect e = std::__invoke(M, std::forward<T>(obj));
- assert(&e == expect);
- }
+ void runTest(Fn M, T& obj, ObjectType* expect) {
+ {
+ static_assert((std::is_same< decltype(std::__invoke(M, std::forward<T>(obj))), Expect >::value), "");
+ Expect e = std::__invoke(M, std::forward<T>(obj));
+ assert(&e == expect);
+ }
}
};
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp
index ba1c655da..46ca59ccc 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp
@@ -114,7 +114,6 @@ private:
Functor03& operator=(Functor03 const&);
};
-
//==============================================================================
// TestCaseFunctorImp - A test case for an operator() class method.
// ClassType - The type of the call object.
@@ -166,7 +165,7 @@ public:
//==============================================================================
template <class Sig, int Arity, class ArgCaster>
void runFunctionTestCase() {
- TestCaseFreeFunction<Sig, freeFunction03, Arity, ArgCaster>();
+ TestCaseFreeFunction<Sig, freeFunction03, Arity, ArgCaster>();
}
template <class Sig, int Arity, class ObjCaster, class ArgCaster>
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp
index bfcea06e9..47b5652ce 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp
@@ -28,7 +28,7 @@ struct Type
int main(int, char**)
{
static_assert(sizeof(std::__invoke(&Type::f1, std::declval<Type >())) == 1, "");
- static_assert(sizeof(std::__invoke(&Type::f2, std::declval<Type const >())) == 2, "");
+ static_assert(sizeof(std::__invoke(&Type::f2, std::declval<Type const >())) == 2, "");
- return 0;
+ return 0;
}
diff --git a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp
index d96188439..2ef5c4ed3 100644
--- a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp
@@ -28,11 +28,11 @@
#include "test_macros.h"
template <class T>
-struct HasNonTrivialABI : std::integral_constant<bool,
- !std::is_trivially_destructible<T>::value
- || (std::is_copy_constructible<T>::value && !std::is_trivially_copy_constructible<T>::value)
-> {};
-
+struct HasNonTrivialABI
+ : std::integral_constant<
+ bool,
+ !std::is_trivially_destructible<T>::value ||
+ (std::is_copy_constructible<T>::value && !std::is_trivially_copy_constructible<T>::value) > {};
void test_trivial()
{
diff --git a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp
index 1dafb10ce..569dab59e 100644
--- a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp
@@ -25,10 +25,11 @@
#include "test_macros.h"
template <class T>
-struct HasTrivialABI : std::integral_constant<bool,
- std::is_trivially_destructible<T>::value
- && (!std::is_copy_constructible<T>::value || std::is_trivially_copy_constructible<T>::value)
-> {};
+struct HasTrivialABI
+ : std::integral_constant<
+ bool,
+ std::is_trivially_destructible<T>::value &&
+ (!std::is_copy_constructible<T>::value || std::is_trivially_copy_constructible<T>::value) > {};
struct TrivialNoAssignment {
int arr[4];
@@ -56,10 +57,10 @@ void test_trivial()
static_assert(std::is_trivially_destructible<P>::value, "");
}
{
- using P = std::pair<TrivialNoConstruction, int>;
- static_assert(!std::is_trivially_copy_assignable<P>::value, "");
- static_assert(!std::is_trivially_move_assignable<P>::value, "");
- static_assert(std::is_trivially_destructible<P>::value, "");
+ using P = std::pair<TrivialNoConstruction, int>;
+ static_assert(!std::is_trivially_copy_assignable<P>::value, "");
+ static_assert(!std::is_trivially_move_assignable<P>::value, "");
+ static_assert(std::is_trivially_destructible<P>::value, "");
}
}
|
llvmbot
added
the
libc++
Member
|
@llvm/pr-subscribers-libcxx Author: Nikolas Klauser (philnik777) ChangesThis is dead code, since Patch is 91.62 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/169354.diff 38 Files Affected:
diff --git a/libcxx/test/libcxx-03/algorithms/half_positive.pass.cpp b/libcxx/test/libcxx-03/algorithms/half_positive.pass.cpp
index 292fcf356554b..ad0cac2a1bd65 100644
--- a/libcxx/test/libcxx-03/algorithms/half_positive.pass.cpp
+++ b/libcxx/test/libcxx-03/algorithms/half_positive.pass.cpp
@@ -41,17 +41,5 @@ int main(int, char**)
#endif // !defined(TEST_HAS_NO_INT128)
}
-#if TEST_STD_VER >= 11
- {
- static_assert(test<char>(), "");
- static_assert(test<int>(), "");
- static_assert(test<long>(), "");
- static_assert(test<std::size_t>(), "");
-#if !defined(TEST_HAS_NO_INT128)
- static_assert(test<__int128_t>(), "");
-#endif // !defined(TEST_HAS_NO_INT128)
- }
-#endif // TEST_STD_VER >= 11
-
return 0;
}
diff --git a/libcxx/test/libcxx-03/algorithms/robust_against_copying_comparators.pass.cpp b/libcxx/test/libcxx-03/algorithms/robust_against_copying_comparators.pass.cpp
index 256251686bb3e..2e3fc6db45c93 100644
--- a/libcxx/test/libcxx-03/algorithms/robust_against_copying_comparators.pass.cpp
+++ b/libcxx/test/libcxx-03/algorithms/robust_against_copying_comparators.pass.cpp
@@ -82,17 +82,6 @@ struct BinaryTransform {
TEST_CONSTEXPR T operator()(T, T) const { return 0; }
};
-#if TEST_STD_VER > 17
-template <class T>
-struct ThreeWay {
- int* copies_;
- constexpr explicit ThreeWay(int* copies) : copies_(copies) {}
- constexpr ThreeWay(const ThreeWay& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
- constexpr ThreeWay& operator=(const ThreeWay&) = default;
- constexpr std::strong_ordering operator()(T, T) const { return std::strong_ordering::equal; }
-};
-#endif
-
template <class T>
TEST_CONSTEXPR_CXX20 bool all_the_algorithms() {
T a[10] = {};
@@ -109,28 +98,14 @@ TEST_CONSTEXPR_CXX20 bool all_the_algorithms() {
int copies = 0;
(void)std::adjacent_find(first, last, Equal<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER >= 11
- (void)std::all_of(first, last, UnaryTrue<T>(&copies));
- assert(copies == 0);
- (void)std::any_of(first, last, UnaryTrue<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::binary_search(first, last, value, Less<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER > 17
- (void)std::clamp(value, value, value, Less<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::count_if(first, last, UnaryTrue<T>(&copies));
assert(copies == 0);
(void)std::copy_if(first, last, first2, UnaryTrue<T>(&copies));
assert(copies == 0);
(void)std::equal(first, last, first2, Equal<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER > 11
- (void)std::equal(first, last, first2, last2, Equal<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::equal_range(first, last, value, Less<T>(&copies));
assert(copies == 0);
(void)std::find_end(first, last, first2, mid2, Equal<T>(&copies));
@@ -144,10 +119,6 @@ TEST_CONSTEXPR_CXX20 bool all_the_algorithms() {
(void)std::for_each(first, last, UnaryVoid<T>(&copies));
assert(copies == 1);
copies = 0;
-#if TEST_STD_VER > 14
- (void)std::for_each_n(first, count, UnaryVoid<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::generate(first, last, NullaryValue<T>(&copies));
assert(copies == 0);
(void)std::generate_n(first, count, NullaryValue<T>(&copies));
@@ -162,10 +133,6 @@ TEST_CONSTEXPR_CXX20 bool all_the_algorithms() {
assert(copies == 0);
(void)std::is_permutation(first, last, first2, Equal<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER > 11
- (void)std::is_permutation(first, last, first2, last2, Equal<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::is_sorted(first, last, Less<T>(&copies));
assert(copies == 0);
(void)std::is_sorted_until(first, last, Less<T>(&copies));
@@ -176,52 +143,28 @@ TEST_CONSTEXPR_CXX20 bool all_the_algorithms() {
}
(void)std::lexicographical_compare(first, last, first2, last2, Less<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER > 17
- (void)std::lexicographical_compare_three_way(first, last, first2, last2, ThreeWay<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::lower_bound(first, last, value, Less<T>(&copies));
assert(copies == 0);
(void)std::make_heap(first, last, Less<T>(&copies));
assert(copies == 0);
(void)std::max(value, value, Less<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER >= 11
- (void)std::max({value, value}, Less<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::max_element(first, last, Less<T>(&copies));
assert(copies == 0);
(void)std::merge(first, mid, mid, last, first2, Less<T>(&copies));
assert(copies == 0);
(void)std::min(value, value, Less<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER >= 11
- (void)std::min({value, value}, Less<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::min_element(first, last, Less<T>(&copies));
assert(copies == 0);
(void)std::minmax(value, value, Less<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER >= 11
- (void)std::minmax({value, value}, Less<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::minmax_element(first, last, Less<T>(&copies));
assert(copies == 0);
(void)std::mismatch(first, last, first2, Equal<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER > 11
- (void)std::mismatch(first, last, first2, last2, Equal<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::next_permutation(first, last, Less<T>(&copies));
assert(copies == 0);
-#if TEST_STD_VER >= 11
- (void)std::none_of(first, last, UnaryTrue<T>(&copies));
- assert(copies == 0);
-#endif
(void)std::nth_element(first, mid, last, Less<T>(&copies));
assert(copies == 0);
(void)std::partial_sort(first, mid, last, Less<T>(&copies));
@@ -299,14 +242,6 @@ bool test_segmented_iterator() {
assert(copies == 1);
copies = 0;
-#if TEST_STD_VER >= 20
- std::vector<std::vector<int>> vecs(3, std::vector<int>(10));
- auto v = std::views::join(vecs);
- (void)std::for_each(v.begin(), v.end(), UnaryVoid<int>(&copies));
- assert(copies == 1);
- copies = 0;
-#endif
-
return true;
}
@@ -314,10 +249,6 @@ int main(int, char**) {
all_the_algorithms<void*>();
all_the_algorithms<int>();
assert(test_segmented_iterator());
-#if TEST_STD_VER > 17
- static_assert(all_the_algorithms<void*>());
- static_assert(all_the_algorithms<int>());
-#endif
return 0;
}
diff --git a/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp b/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
index 03fef57ee259a..009a234030198 100644
--- a/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
+++ b/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
@@ -99,10 +99,6 @@ void test() {
(void) std::equal_range(it, it, 0, pred);
(void) std::equal(it, it, it);
(void) std::equal(it, it, it, pred);
-#if TEST_STD_VER > 11
- (void) std::equal(it, it, it, it);
- (void) std::equal(it, it, it, it, pred);
-#endif
(void) std::fill_n(it, 0, 0);
(void) std::fill(it, it, 0);
(void) std::find_end(it, it, it, it);
@@ -112,9 +108,6 @@ void test() {
(void) std::find_if_not(it, it, pred);
(void) std::find_if(it, it, pred);
(void) std::find(it, it, 0);
-#if TEST_STD_VER > 14
- (void) std::for_each_n(it, 0, pred);
-#endif
(void) std::for_each(it, it, pred);
(void) std::generate_n(it, 0, pred);
(void) std::generate(it, it, pred);
@@ -129,20 +122,12 @@ void test() {
(void) std::is_partitioned(it, it, pred);
(void) std::is_permutation(it, it, it);
(void) std::is_permutation(it, it, it, pred);
-#if TEST_STD_VER > 11
- (void) std::is_permutation(it, it, it, it);
- (void) std::is_permutation(it, it, it, it, pred);
-#endif
(void) std::is_sorted_until(it, it);
(void) std::is_sorted_until(it, it, pred);
(void) std::is_sorted(it, it);
(void) std::is_sorted(it, it, pred);
(void) std::lexicographical_compare(it, it, it, it);
(void) std::lexicographical_compare(it, it, it, it, pred);
-#if TEST_STD_VER > 17
- (void)std::lexicographical_compare_three_way(it, it, it, it);
- (void)std::lexicographical_compare_three_way(it, it, it, it, std::compare_three_way());
-#endif
(void) std::lower_bound(it, it, 0);
(void) std::lower_bound(it, it, 0, pred);
(void) std::make_heap(it, it);
@@ -189,14 +174,8 @@ void test() {
(void) std::reverse(it, it);
(void) std::rotate_copy(it, it, it, it);
(void) std::rotate(it, it, it);
-#if TEST_STD_VER > 14
- (void) std::sample(it, it, it, 0, rng);
-#endif
(void) std::search(it, it, it, it);
(void) std::search(it, it, it, it, pred);
-#if TEST_STD_VER > 14
- (void) std::search(it, it, std::default_searcher<Cpp20HostileIterator<int*>>(it, it));
-#endif
(void) std::set_difference(it, it, it, it, it);
(void) std::set_difference(it, it, it, it, it, pred);
(void) std::set_intersection(it, it, it, it, it);
@@ -205,10 +184,6 @@ void test() {
(void) std::set_symmetric_difference(it, it, it, it, it, pred);
(void) std::set_union(it, it, it, it, it);
(void) std::set_union(it, it, it, it, it, pred);
-#if TEST_STD_VER > 17
- (void) std::shift_left(it, it, 0);
- (void) std::shift_right(it, it, 0);
-#endif
(void) std::shuffle(it, it, rng);
(void) std::sort_heap(it, it);
(void) std::sort_heap(it, it, pred);
diff --git a/libcxx/test/libcxx-03/containers/sequences/vector/asan.pass.cpp b/libcxx/test/libcxx-03/containers/sequences/vector/asan.pass.cpp
index 03d2b3e6ce9b9..72875a52246c4 100644
--- a/libcxx/test/libcxx-03/containers/sequences/vector/asan.pass.cpp
+++ b/libcxx/test/libcxx-03/containers/sequences/vector/asan.pass.cpp
@@ -26,29 +26,6 @@ extern "C" void __sanitizer_set_death_callback(void (*callback)(void));
void do_exit() { exit(0); }
int main(int, char**) {
-#if TEST_STD_VER >= 11
- {
- typedef int T;
- typedef cpp17_input_iterator<T*> MyInputIter;
- std::vector<T, min_allocator<T>> v;
- v.reserve(1);
- int i[] = {42};
- v.insert(v.begin(), MyInputIter(i), MyInputIter(i + 1));
- assert(v[0] == 42);
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- typedef char T;
- typedef cpp17_input_iterator<T*> MyInputIter;
- std::vector<T, unaligned_allocator<T>> v;
- v.reserve(1);
- char i[] = {'a', 'b'};
- v.insert(v.begin(), MyInputIter(i), MyInputIter(i + 2));
- assert(v[0] == 'a');
- assert(v[1] == 'b');
- assert(is_contiguous_container_asan_correct(v));
- }
-#endif // TEST_STD_VER >= 11
{
typedef cpp17_input_iterator<int*> MyInputIter;
// Sould not trigger ASan.
diff --git a/libcxx/test/libcxx-03/containers/sequences/vector/asan_throw.pass.cpp b/libcxx/test/libcxx-03/containers/sequences/vector/asan_throw.pass.cpp
index dcfa8029cfc0d..c18242af4ed3c 100644
--- a/libcxx/test/libcxx-03/containers/sequences/vector/asan_throw.pass.cpp
+++ b/libcxx/test/libcxx-03/containers/sequences/vector/asan_throw.pass.cpp
@@ -68,23 +68,6 @@ void test_push_back() {
assert(is_contiguous_container_asan_correct(v));
}
-void test_emplace_back() {
-#if TEST_STD_VER >= 11
- std::vector<X> v;
- v.reserve(2);
- v.push_back(X(2));
- assert(v.size() == 1);
- try {
- v.emplace_back(42);
- assert(0);
- } catch (int e) {
- assert(v.size() == 1);
- }
- assert(v.size() == 1);
- assert(is_contiguous_container_asan_correct(v));
-#endif
-}
-
void test_insert_range() {
std::vector<X> v;
v.reserve(4);
@@ -119,24 +102,6 @@ void test_insert() {
assert(is_contiguous_container_asan_correct(v));
}
-void test_emplace() {
-#if TEST_STD_VER >= 11
- std::vector<X> v;
- v.reserve(3);
- v.insert(v.end(), X(1));
- v.insert(v.begin(), X(2));
- assert(v.size() == 2);
- try {
- v.emplace(v.end(), 42);
- assert(0);
- } catch (int e) {
- assert(v.size() == 2);
- }
- assert(v.size() == 2);
- assert(is_contiguous_container_asan_correct(v));
-#endif
-}
-
void test_insert_range2() {
std::vector<X> v;
v.reserve(4);
@@ -219,10 +184,8 @@ void test_resize_param() {
int main(int, char**) {
test_push_back();
- test_emplace_back();
test_insert_range();
test_insert();
- test_emplace();
test_insert_range2();
test_insert_n();
test_insert_n2();
diff --git a/libcxx/test/libcxx-03/depr/depr.default.allocator/allocator.members/construct.cxx20.pass.cpp b/libcxx/test/libcxx-03/depr/depr.default.allocator/allocator.members/construct.cxx20.pass.cpp
index 9a37cf8af8e69..4e1cda55c991d 100644
--- a/libcxx/test/libcxx-03/depr/depr.default.allocator/allocator.members/construct.cxx20.pass.cpp
+++ b/libcxx/test/libcxx-03/depr/depr.default.allocator/allocator.members/construct.cxx20.pass.cpp
@@ -38,24 +38,6 @@ struct A {
int move_only_constructed = 0;
-#if TEST_STD_VER >= 11
-class move_only {
- move_only(const move_only&) = delete;
- move_only& operator=(const move_only&) = delete;
-
-public:
- move_only(move_only&&) { ++move_only_constructed; }
- move_only& operator=(move_only&&) { return *this; }
-
- move_only() { ++move_only_constructed; }
- ~move_only() { --move_only_constructed; }
-
-public:
- int data; // unused other than to make sizeof(move_only) == sizeof(int).
- // but public to suppress "-Wunused-private-field"
-};
-#endif // TEST_STD_VER >= 11
-
int main(int, char**) {
globalMemCounter.reset();
{
@@ -107,41 +89,6 @@ int main(int, char**) {
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(A_constructed == 0);
}
-#if TEST_STD_VER >= 11
- {
- std::allocator<move_only> a;
- assert(globalMemCounter.checkOutstandingNewEq(0));
- assert(move_only_constructed == 0);
-
- globalMemCounter.last_new_size = 0;
- move_only* ap = a.allocate(3);
- DoNotOptimize(ap);
- assert(globalMemCounter.checkOutstandingNewEq(1));
- assert(globalMemCounter.checkLastNewSizeEq(3 * sizeof(int)));
- assert(move_only_constructed == 0);
-
- a.construct(ap);
- assert(globalMemCounter.checkOutstandingNewEq(1));
- assert(move_only_constructed == 1);
-
- a.destroy(ap);
- assert(globalMemCounter.checkOutstandingNewEq(1));
- assert(move_only_constructed == 0);
-
- a.construct(ap, move_only());
- assert(globalMemCounter.checkOutstandingNewEq(1));
- assert(move_only_constructed == 1);
-
- a.destroy(ap);
- assert(globalMemCounter.checkOutstandingNewEq(1));
- assert(move_only_constructed == 0);
-
- a.deallocate(ap, 3);
- DoNotOptimize(ap);
- assert(globalMemCounter.checkOutstandingNewEq(0));
- assert(move_only_constructed == 0);
- }
-#endif
return 0;
}
diff --git a/libcxx/test/libcxx-03/input.output/string.streams/stringbuf/const_sso_buffer.pass.cpp b/libcxx/test/libcxx-03/input.output/string.streams/stringbuf/const_sso_buffer.pass.cpp
index d6caa3389b8fa..b6cc6e506ff32 100644
--- a/libcxx/test/libcxx-03/input.output/string.streams/stringbuf/const_sso_buffer.pass.cpp
+++ b/libcxx/test/libcxx-03/input.output/string.streams/stringbuf/const_sso_buffer.pass.cpp
@@ -20,7 +20,6 @@
#include <cassert>
#include "test_macros.h"
-#include "min_allocator.h"
template <class CharT>
struct test_buf : public std::basic_stringbuf<CharT> {
@@ -40,29 +39,6 @@ struct test_buf : public std::basic_stringbuf<CharT> {
explicit test_buf(std::ios_base::openmode which) : std::basic_stringbuf<CharT>(which) {}
explicit test_buf(const std::basic_string<CharT>& s) : std::basic_stringbuf<CharT>(s) {}
-#if TEST_STD_VER >= 20
- explicit test_buf(const std::allocator<CharT>& a) : std::basic_stringbuf<CharT>(a) {}
- test_buf(std::ios_base::openmode which, const std::allocator<CharT>& a) : std::basic_stringbuf<CharT>(which, a) {}
- explicit test_buf(std::basic_string<CharT>&& s)
- : std::basic_stringbuf<CharT>(std::forward<std::basic_string<CharT>>(s)) {}
-
- test_buf(const std::basic_string<CharT, std::char_traits<CharT>, min_allocator<CharT>>& s,
- const std::allocator<CharT>& a)
- : std::basic_stringbuf<CharT>(s, a) {}
- test_buf(const std::basic_string<CharT, std::char_traits<CharT>, min_allocator<CharT>>& s,
- std::ios_base::openmode which,
- const std::allocator<CharT>& a)
- : std::basic_stringbuf<CharT>(s, which, a) {}
- test_buf(const std::basic_string<CharT, std::char_traits<CharT>, min_allocator<CharT>>& s)
- : std::basic_stringbuf<CharT>(s) {}
-#endif // TEST_STD_VER >= 20
-
-#if TEST_STD_VER >= 26
- test_buf(std::basic_string_view<CharT> s) : std::basic_stringbuf<CharT>(s) {}
- test_buf(std::basic_string_view<CharT> s, const std::allocator<CharT>& a) : std::basic_stringbuf<CharT>(s, a) {}
- test_buf(std::basic_string_view<CharT> s, std::ios_base::openmode which, const std::allocator<CharT>& a)
- : std::basic_stringbuf<CharT>(s, which, a) {}
-#endif // TEST_STD_VER >= 26
};
template <class CharT>
@@ -88,76 +64,6 @@ static void test() {
assert(b.pptr() == b.pbase());
assert(b.epptr() == b.pbase() + size); // copy so uses size
}
-#if TEST_STD_VER >= 20
- {
- test_buf<CharT> b = test_buf<CharT>(std::allocator<CharT>());
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size);
- }
- {
- test_buf<CharT> b = test_buf<CharT>(std::ios_base::out, std::allocator<CharT>());
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size);
- }
- {
- std::basic_string<CharT> s;
- s.reserve(1024);
- std::size_t capacity = s.capacity();
- test_buf<CharT> b = test_buf<CharT>(std::move(s));
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() >= b.pbase() + capacity); // move so uses s.capacity()
- }
- {
- std::basic_string<CharT, std::char_traits<CharT>, min_allocator<CharT>> s;
- s.reserve(1024);
- test_buf<CharT> b = test_buf<CharT>(s, std::allocator<CharT>());
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size); // copy so uses size
- }
- {
- std::basic_string<CharT, std::char_traits<CharT>, min_allocator<CharT>> s;
- s.reserve(1024);
- test_buf<CharT> b = test_buf<CharT>(s, std::ios_base::out, std::allocator<CharT>());
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size); // copy so uses size
- }
- {
- std::basic_string<CharT, std::char_traits<CharT>, min_allocator<CharT>> s;
- s.reserve(1024);
- test_buf<CharT> b = test_buf<CharT>(s);
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size); // copy so uses size
- }
-#endif // TEST_STD_VER >= 20
-#if TEST_STD_VER >= 26
- {
- std::basic_string_view<CharT> s;
- test_buf<CharT> b = test_buf<CharT>(s);
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size);
- }
- {
- std::basic_string_view<CharT> s;
- test_buf<CharT> b = test_buf<CharT>(s, std::allocator<CharT>());
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size);
- }
- {
- std::basic_string_view<CharT> s;
- test_buf<CharT> b = test_buf<CharT>(s, std::ios_base::out, std::allocator<CharT>());
- assert(b.pbase() != nullptr);
- assert(b.pptr() == b.pbase());
- assert(b.epptr() == b.pbase() + size);
- }
-#endif // TEST_STD_VER >= 26
}
int main(int, char**) {
diff --git a/libcxx/test/libcxx-03/iterators/bounded_iter/arithmetic.pass.cpp b/libcxx/test/libcxx-03/iterators/bounded_iter/arithmetic.pass.cpp
index b4b6e7fa1940c..b5b6916ab1a51 100644
--- a/libcxx/test/libcxx-03/iterators/bounded_iter/arithmetic.pass.cpp
+++ b/libcxx/test/libcxx-03/iterators/bounded_iter/arithmetic.pass.cpp
@@ -99,14 +99,6 @@ TEST_CONSTEXPR_CXX14 bool tests() {
int main(int, char**) {
tests<int*>();
-#if TEST_STD_VER > 11
- static_assert(tests<int*>(), "");
-#endif
-
-#if TEST_STD_VER > 17
- tests<contiguous_iterator<int*> >();
- static_assert(tests<contiguous_iterator<int*> >(), "");
-#endif
return 0;
}
diff --git a/libcxx/test/libcxx-03/iterators/bounded_iter/comparison.pass.cpp b/libcxx/test/libcxx-03/iterators/bounded_iter/comparison.pass.cpp
index 490bfed54a159..9c6ce283f53d9 100644
--- a/libcxx/test/libcxx-03/iterators/bounded_iter/comparison.pass.cpp
+++ b/libcxx/test/libc...
[truncated]
|
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/10/builds/18116 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is dead code, since
test/libcxx-03is only ever executed with-std=c++03.