[libcxx][test] Avoid warnings about unused variables and typedefs if _LIBCPP_VERSION is not defined#155679
Merged
philnik777 merged 3 commits intollvm:mainfrom Sep 2, 2025
Conversation
…_LIBCPP_VERSION is not defined Make these tests pass with MSVC STL
Member
|
@llvm/pr-subscribers-libcxx Author: Alex Guteniev (AlexGuteniev) ChangesMake these tests pass with MSVC STL Full diff: https://github.com/llvm/llvm-project/pull/155679.diff 5 Files Affected:
diff --git a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.cons/move_assign_noexcept.compile.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.cons/move_assign_noexcept.compile.pass.cpp
index 18d332cf27b5b..ea39686653b08 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.cons/move_assign_noexcept.compile.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.cons/move_assign_noexcept.compile.pass.cpp
@@ -50,10 +50,12 @@ struct MoveThrowsComp {
};
void test() {
+#if defined(_LIBCPP_VERSION)
{
using C = std::flat_map<int, int>;
LIBCPP_STATIC_ASSERT(std::is_nothrow_move_assignable_v<C>);
}
+#endif
{
using C =
std::flat_map<MoveOnly,
@@ -72,6 +74,7 @@ void test() {
std::vector<MoveOnly, test_allocator<MoveOnly>>>;
static_assert(!std::is_nothrow_move_assignable_v<C>);
}
+#if defined(_LIBCPP_VERSION)
{
using C =
std::flat_map<MoveOnly,
@@ -95,6 +98,7 @@ void test() {
using C = std::flat_map<int, int, MoveThrowsComp>;
LIBCPP_STATIC_ASSERT(!std::is_nothrow_move_assignable_v<C>);
}
+#endif
{
// Test with a container that throws on move-assignment.
using C = std::flat_map<int, int, std::less<int>, std::pmr::vector<int>, std::vector<int>>;
diff --git a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.erasure/erase_if_exceptions.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.erasure/erase_if_exceptions.pass.cpp
index 48fdec42db3fc..b15c5755d9bdb 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.erasure/erase_if_exceptions.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.erasure/erase_if_exceptions.pass.cpp
@@ -66,7 +66,9 @@ struct ErasurePredicate {
};
int main(int, char**) {
+#if defined(_LIBCPP_VERSION)
const std::pair<int, int> expected[] = {{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}, {6, 6}, {7, 7}, {8, 8}};
+#endif
{
using M = std::flat_map<ThrowingAssignment, int, ThrowingComparator>;
for (int first_throw = 1; first_throw < 99; ++first_throw) {
diff --git a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.cons/move_assign_noexcept.compile.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.cons/move_assign_noexcept.compile.pass.cpp
index 1aa40759fada9..145c6cb7a0009 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.cons/move_assign_noexcept.compile.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.cons/move_assign_noexcept.compile.pass.cpp
@@ -50,10 +50,12 @@ struct MoveThrowsComp {
};
void test() {
+#if defined(_LIBCPP_VERSION)
{
using C = std::flat_multimap<int, int>;
LIBCPP_STATIC_ASSERT(std::is_nothrow_move_assignable_v<C>);
}
+#endif
{
using C =
std::flat_multimap<MoveOnly,
@@ -72,6 +74,7 @@ void test() {
std::vector<MoveOnly, test_allocator<MoveOnly>>>;
static_assert(!std::is_nothrow_move_assignable_v<C>);
}
+#if defined(_LIBCPP_VERSION)
{
using C =
std::flat_multimap<MoveOnly,
@@ -95,6 +98,7 @@ void test() {
using C = std::flat_multimap<int, int, MoveThrowsComp>;
LIBCPP_STATIC_ASSERT(!std::is_nothrow_move_assignable_v<C>);
}
+#endif
{
// Test with a container that throws on move-assignment.
using C = std::flat_multimap<int, int, std::less<int>, std::pmr::vector<int>, std::vector<int>>;
diff --git a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.erasure/erase_if_exceptions.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.erasure/erase_if_exceptions.pass.cpp
index 13b57202f7862..c7a4c3e632983 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.erasure/erase_if_exceptions.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.erasure/erase_if_exceptions.pass.cpp
@@ -68,7 +68,9 @@ struct ErasurePredicate {
};
int main(int, char**) {
+#if defined(_LIBCPP_VERSION)
const std::pair<int, int> expected[] = {{1, 1}, {2, 2}, {3, 3}, {3, 3}, {5, 5}, {6, 6}, {7, 7}, {8, 8}};
+#endif
{
using M = std::flat_multimap<ThrowingAssignment, int, ThrowingComparator>;
for (int first_throw = 1; first_throw < 99; ++first_throw) {
diff --git a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.erasure/erase_if_exceptions.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.erasure/erase_if_exceptions.pass.cpp
index 37b4a40f0165c..bccb5360878d3 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.erasure/erase_if_exceptions.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.erasure/erase_if_exceptions.pass.cpp
@@ -66,7 +66,9 @@ struct ErasurePredicate {
};
void test() {
+#if defined(_LIBCPP_VERSION)
const int expected[] = {1, 2, 3, 4, 5, 6, 7, 8};
+#endif
{
using M = std::flat_set<ThrowingAssignment, ThrowingComparator>;
for (int first_throw = 1; first_throw < 99; ++first_throw) {
|
philnik777
requested changes
Aug 28, 2025
...d/containers/container.adaptors/flat.map/flat.map.cons/move_assign_noexcept.compile.pass.cpp
Outdated
Show resolved
Hide resolved
philnik777
approved these changes
Aug 28, 2025
Contributor
philnik777
left a comment
There was a problem hiding this comment.
LGTM assuming the CI is happy.
Contributor
|
@AlexGuteniev Do you need the branch to be merged? |
Contributor
Author
Yes, please |
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
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.
Make these tests pass with MSVC STL