Skip to content

[libc++][test] Fix simple warnings #74186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldionne merged 4 commits into from
Dec 5, 2023
Merged

[libc++][test] Fix simple warnings #74186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7954b7
Add void-casts to fix -Wunused-variable warnings.
StephanTLavavej Nov 30, 2023
75e0cd8
Avoid sign/truncation warnings in ConvertibleToIntegral.h.
StephanTLavavej Dec 1, 2023
3fc15e7
Fix: Add `TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED`.
StephanTLavavej Dec 5, 2023
9fa9e1b
Cleanup: Add `TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED` for consiste…
StephanTLavavej Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ struct Test1OutIters {

TEST_CONSTEXPR_CXX20 bool test() {
types::for_each(types::cpp17_input_iterator_list<int*>(), TestOutIters());
if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
if (TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED)
types::for_each(types::cpp17_input_iterator_list<std::unique_ptr<int>*>(), Test1OutIters());

{ // Make sure that padding bits aren't copied
Expand Down
2 changes: 1 addition & 1 deletion libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct Test1OutIters {

TEST_CONSTEXPR_CXX20 bool test() {
types::for_each(types::bidirectional_iterator_list<int*>(), TestOutIters());
if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
if (TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED)
types::for_each(types::bidirectional_iterator_list<std::unique_ptr<int>*>(), Test1OutIters());

{ // Make sure that padding bits aren't copied
Expand Down
2 changes: 1 addition & 1 deletion libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct Test {
TEST_CONSTEXPR_CXX20 bool test() {
types::for_each(types::cpp17_input_iterator_list<const int*>(), Test());

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
std::vector<bool> vec(256 + 64);
for (ptrdiff_t i = 0; i != 256; ++i) {
for (size_t offset = 0; offset != 64; ++offset) {
Expand Down
8 changes: 4 additions & 4 deletions libcxx/test/std/containers/views/mdspan/ConvertibleToIntegral.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ struct IntType {

constexpr bool operator==(const IntType& rhs) const { return val == rhs.val; }
constexpr operator int() const noexcept { return val; }
constexpr operator unsigned char() const { return val; }
constexpr operator signed char() const noexcept { return val; }
constexpr operator unsigned char() const { return static_cast<unsigned char>(val); }
constexpr operator signed char() const noexcept { return static_cast<signed char>(val); }
};

// only non-const convertible
Expand All @@ -28,8 +28,8 @@ struct IntTypeNC {

constexpr bool operator==(const IntType& rhs) const { return val == rhs.val; }
constexpr operator int() noexcept { return val; }
constexpr operator unsigned() { return val; }
constexpr operator char() noexcept { return val; }
constexpr operator unsigned() { return static_cast<unsigned>(val); }
constexpr operator char() noexcept { return static_cast<char>(val); }
};

// weird configurability of convertibility to int
Expand Down
1 change: 1 addition & 0 deletions libcxx/test/std/numerics/rand/rand.device/ctor.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ void check_random_device_invalid(const std::string &token) {
int main(int, char**) {
{
std::random_device r;
(void)r;
}
// Check the validity of various tokens
{
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/strings/string.view/string.view.comparison/equal.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((ConvertibleTo<SV>(v[i]) == v[j]) == expected);
assert((v[i] == ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(v[i]) == v[j]) == expected);
assert((v[i] == std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((abc.data() == abc0def) == false);
assert((abc0def == abc.data()) == false);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(abc) == abc0def) == false);
assert((abc0def == std::basic_string<CharT, Traits>(abc)) == false);
}
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/strings/string.view/string.view.comparison/greater.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((ConvertibleTo<SV>(v[i]) > v[j]) == expected);
assert((v[i] > ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(v[i]) > v[j]) == expected);
assert((v[i] > std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((abc.data() > abc0def) == false);
assert((abc0def > abc.data()) == true);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(abc) > abc0def) == false);
assert((abc0def > std::basic_string<CharT, Traits>(abc)) == true);
}
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/strings/string.view/string.view.comparison/greater_equal.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((ConvertibleTo<SV>(v[i]) >= v[j]) == expected);
assert((v[i] >= ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(v[i]) >= v[j]) == expected);
assert((v[i] >= std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((abc.data() >= abc0def) == false);
assert((abc0def >= abc.data()) == true);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(abc) >= abc0def) == false);
assert((abc0def >= std::basic_string<CharT, Traits>(abc)) == true);
}
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/strings/string.view/string.view.comparison/less.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((ConvertibleTo<SV>(v[i]) < v[j]) == expected);
assert((v[i] < ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(v[i]) < v[j]) == expected);
assert((v[i] < std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((abc.data() < abc0def) == true);
assert((abc0def < abc.data()) == false);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(abc) < abc0def) == true);
assert((abc0def < std::basic_string<CharT, Traits>(abc)) == false);
}
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/strings/string.view/string.view.comparison/less_equal.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((ConvertibleTo<SV>(v[i]) <= v[j]) == expected);
assert((v[i] <= ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(v[i]) <= v[j]) == expected);
assert((v[i] <= std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((abc.data() <= abc0def) == true);
assert((abc0def <= abc.data()) == false);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(abc) <= abc0def) == true);
assert((abc0def <= std::basic_string<CharT, Traits>(abc)) == false);
}
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/strings/string.view/string.view.comparison/not_equal.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((ConvertibleTo<SV>(v[i]) != v[j]) == expected);
assert((v[i] != ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(v[i]) != v[j]) == expected);
assert((v[i] != std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX14 bool test() {
assert((abc.data() != abc0def) == true);
assert((abc0def != abc.data()) == true);

if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
if (TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED) {
assert((std::basic_string<CharT, Traits>(abc) != abc0def) == true);
assert((abc0def != std::basic_string<CharT, Traits>(abc)) == true);
}
Expand Down
1 change: 1 addition & 0 deletions libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/mutex.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ int main(int, char**)
{
using LG = std::scoped_lock<>;
LG lg;
(void)lg;
}
{
using LG = std::scoped_lock<TestMutex>;
Expand Down
3 changes: 2 additions & 1 deletion ....requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/default.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
int main(int, char**)
{
std::shared_mutex m;
(void)m;

return 0;
return 0;
}
12 changes: 12 additions & 0 deletions libcxx/test/support/test_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,18 @@
# define TEST_IS_CONSTANT_EVALUATED false
#endif

#if TEST_STD_VER >= 23
# define TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED true
#else
# define TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED (!TEST_IS_CONSTANT_EVALUATED)
#endif

#if TEST_STD_VER >= 20
# define TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED true
#else
# define TEST_STD_AT_LEAST_20_OR_RUNTIME_EVALUATED (!TEST_IS_CONSTANT_EVALUATED)
#endif

#if TEST_STD_VER >= 14
# define TEST_CONSTEXPR_CXX14 constexpr
#else
Expand Down