[libcxx-commits] [libcxx] Non-constant instances have been made constant in data_const.pass.cpp (PR #122085)
via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Jan 8 06:44:37 PST 2025
https://github.com/2LoS updated https://github.com/llvm/llvm-project/pull/122085
>From 5ef53b1c3532a5378372b31d406f4775685237e0 Mon Sep 17 00:00:00 2001
From: LoS <aurumpuro at gmail.com>
Date: Wed, 8 Jan 2025 11:15:08 +0100
Subject: [PATCH 1/3] Non-constant instances have been made constant in
data_const.pass.cpp tests
---
.../vector/vector.data/data_const.pass.cpp | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
index 885caf272afbf2..05afe0160032ac 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
@@ -39,7 +39,7 @@ TEST_CONSTEXPR_CXX20 bool tests()
assert(is_contiguous_container_asan_correct(v));
}
{
- std::vector<Nasty> v(100);
+ const std::vector<Nasty> v(100);
assert(v.data() == std::addressof(v.front()));
assert(is_contiguous_container_asan_correct(v));
}
@@ -55,24 +55,24 @@ TEST_CONSTEXPR_CXX20 bool tests()
assert(is_contiguous_container_asan_correct(v));
}
{
- std::vector<Nasty, min_allocator<Nasty>> v(100);
+ const std::vector<Nasty, min_allocator<Nasty>> v(100);
assert(v.data() == std::addressof(v.front()));
assert(is_contiguous_container_asan_correct(v));
}
{
- const std::vector<int, safe_allocator<int>> v;
- assert(v.data() == 0);
- assert(is_contiguous_container_asan_correct(v));
+ const std::vector<int, safe_allocator<int>> v;
+ assert(v.data() == 0);
+ assert(is_contiguous_container_asan_correct(v));
}
{
- const std::vector<int, safe_allocator<int>> v(100);
- assert(v.data() == &v.front());
- assert(is_contiguous_container_asan_correct(v));
+ const std::vector<int, safe_allocator<int>> v(100);
+ assert(v.data() == &v.front());
+ assert(is_contiguous_container_asan_correct(v));
}
{
- std::vector<Nasty, safe_allocator<Nasty>> v(100);
- assert(v.data() == std::addressof(v.front()));
- assert(is_contiguous_container_asan_correct(v));
+ const std::vector<Nasty, safe_allocator<Nasty>> v(100);
+ assert(v.data() == std::addressof(v.front()));
+ assert(is_contiguous_container_asan_correct(v));
}
#endif
>From c463b338d12300fc228a75aee9d169da187570eb Mon Sep 17 00:00:00 2001
From: LoS <kaffedesk at gmail.com>
Date: Wed, 8 Jan 2025 15:18:36 +0100
Subject: [PATCH 2/3] Update data_const.pass.cpp
Indentation have been brought back to 2 spaces.
---
.../vector/vector.data/data_const.pass.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
index 05afe0160032ac..0cf0b22047352e 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
@@ -60,19 +60,19 @@ TEST_CONSTEXPR_CXX20 bool tests()
assert(is_contiguous_container_asan_correct(v));
}
{
- const std::vector<int, safe_allocator<int>> v;
- assert(v.data() == 0);
- assert(is_contiguous_container_asan_correct(v));
+ const std::vector<int, safe_allocator<int>> v;
+ assert(v.data() == 0);
+ assert(is_contiguous_container_asan_correct(v));
}
{
- const std::vector<int, safe_allocator<int>> v(100);
- assert(v.data() == &v.front());
- assert(is_contiguous_container_asan_correct(v));
+ const std::vector<int, safe_allocator<int>> v(100);
+ assert(v.data() == &v.front());
+ assert(is_contiguous_container_asan_correct(v));
}
{
- const std::vector<Nasty, safe_allocator<Nasty>> v(100);
- assert(v.data() == std::addressof(v.front()));
- assert(is_contiguous_container_asan_correct(v));
+ const std::vector<Nasty, safe_allocator<Nasty>> v(100);
+ assert(v.data() == std::addressof(v.front()));
+ assert(is_contiguous_container_asan_correct(v));
}
#endif
>From 9d9c0b343e6ecf1a843ab100f21db5a8010ebbdb Mon Sep 17 00:00:00 2001
From: LoS <kaffedesk at gmail.com>
Date: Wed, 8 Jan 2025 15:30:41 +0100
Subject: [PATCH 3/3] Update data_const.pass.cpp
---
.../vector/vector.data/data_const.pass.cpp | 108 +++++++++---------
1 file changed, 54 insertions(+), 54 deletions(-)
diff --git a/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
index 0cf0b22047352e..a78499602724d3 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
@@ -18,72 +18,72 @@
#include "asan_testing.h"
struct Nasty {
- TEST_CONSTEXPR Nasty() : i_(0) {}
- TEST_CONSTEXPR Nasty(int i) : i_(i) {}
- TEST_CONSTEXPR_CXX20 ~Nasty() {}
+ TEST_CONSTEXPR Nasty() : i_(0) {}
+ TEST_CONSTEXPR Nasty(int i) : i_(i) {}
+ TEST_CONSTEXPR_CXX20 ~Nasty() {}
- Nasty * operator&() const { assert(false); return nullptr; }
- int i_;
+ Nasty * operator&() const { assert(false); return nullptr; }
+ int i_;
};
TEST_CONSTEXPR_CXX20 bool tests()
{
- {
- const std::vector<int> v;
- assert(v.data() == 0);
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- const std::vector<int> v(100);
- assert(v.data() == std::addressof(v.front()));
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- const std::vector<Nasty> v(100);
- assert(v.data() == std::addressof(v.front()));
- assert(is_contiguous_container_asan_correct(v));
- }
+ {
+ const std::vector<int> v;
+ assert(v.data() == 0);
+ assert(is_contiguous_container_asan_correct(v));
+ }
+ {
+ const std::vector<int> v(100);
+ assert(v.data() == std::addressof(v.front()));
+ assert(is_contiguous_container_asan_correct(v));
+ }
+ {
+ const std::vector<Nasty> v(100);
+ assert(v.data() == std::addressof(v.front()));
+ assert(is_contiguous_container_asan_correct(v));
+ }
#if TEST_STD_VER >= 11
- {
- const std::vector<int, min_allocator<int>> v;
- assert(v.data() == 0);
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- const std::vector<int, min_allocator<int>> v(100);
- assert(v.data() == &v.front());
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- const std::vector<Nasty, min_allocator<Nasty>> v(100);
- assert(v.data() == std::addressof(v.front()));
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- const std::vector<int, safe_allocator<int>> v;
- assert(v.data() == 0);
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- const std::vector<int, safe_allocator<int>> v(100);
- assert(v.data() == &v.front());
- assert(is_contiguous_container_asan_correct(v));
- }
- {
- const std::vector<Nasty, safe_allocator<Nasty>> v(100);
- assert(v.data() == std::addressof(v.front()));
- assert(is_contiguous_container_asan_correct(v));
- }
+ {
+ const std::vector<int, min_allocator<int>> v;
+ assert(v.data() == 0);
+ assert(is_contiguous_container_asan_correct(v));
+ }
+ {
+ const std::vector<int, min_allocator<int>> v(100);
+ assert(v.data() == &v.front());
+ assert(is_contiguous_container_asan_correct(v));
+ }
+ {
+ const std::vector<Nasty, min_allocator<Nasty>> v(100);
+ assert(v.data() == std::addressof(v.front()));
+ assert(is_contiguous_container_asan_correct(v));
+ }
+ {
+ const std::vector<int, safe_allocator<int>> v;
+ assert(v.data() == 0);
+ assert(is_contiguous_container_asan_correct(v));
+ }
+ {
+ const std::vector<int, safe_allocator<int>> v(100);
+ assert(v.data() == &v.front());
+ assert(is_contiguous_container_asan_correct(v));
+ }
+ {
+ const std::vector<Nasty, safe_allocator<Nasty>> v(100);
+ assert(v.data() == std::addressof(v.front()));
+ assert(is_contiguous_container_asan_correct(v));
+ }
#endif
- return true;
+ return true;
}
int main(int, char**)
{
- tests();
+ tests();
#if TEST_STD_VER > 17
- static_assert(tests());
+ static_assert(tests());
#endif
- return 0;
+ return 0;
}
More information about the libcxx-commits
mailing list