Skip to content

[libc] Use cpp::numeric_limits in preference to C23 <limits.h> macros #102665

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
merged 2 commits into from
Aug 9, 2024
Merged

[libc] Use cpp::numeric_limits in preference to C23 <limits.h> macros #102665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3cc682
[libc] Use cpp::numeric_limits in preference to C23 <limits.h> macros
frobtech Aug 9, 2024
7a691e8
Merge branch 'main' into p/libc-width
frobtech Aug 9, 2024
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
7 changes: 4 additions & 3 deletions libc/src/stdio/printf_core/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include "include/llvm-libc-macros/stdfix-macros.h"
#include "src/__support/CPP/algorithm.h" // max
#include "src/__support/CPP/limits.h"
#include "src/__support/CPP/optional.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/macros/config.h"
Expand Down Expand Up @@ -210,11 +211,11 @@ template <typename ArgProvider> class Parser {
case (LengthModifier::wf):
if (bw == 0) {
section.has_conv = false;
} else if (bw <= INT_WIDTH) {
} else if (bw <= cpp::numeric_limits<int>::digits) {
WRITE_ARG_VAL_SIMPLEST(section.conv_val_raw, int, conv_index);
} else if (bw <= LONG_WIDTH) {
} else if (bw <= cpp::numeric_limits<long>::digits) {
WRITE_ARG_VAL_SIMPLEST(section.conv_val_raw, long, conv_index);
} else if (bw <= LLONG_WIDTH) {
} else if (bw <= cpp::numeric_limits<long long>::digits) {
WRITE_ARG_VAL_SIMPLEST(section.conv_val_raw, long long, conv_index);
} else {
WRITE_ARG_VAL_SIMPLEST(section.conv_val_raw, intmax_t, conv_index);
Expand Down
10 changes: 7 additions & 3 deletions libc/test/src/stdbit/stdc_bit_floor_ui_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ TEST(LlvmLibcStdcBitfloorUiTest, Zero) {
}

TEST(LlvmLibcStdcBitfloorUiTest, Ones) {
for (unsigned i = 0U; i != INT_WIDTH; ++i)
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_floor_ui(UINT_MAX >> i),
1U << (UINT_WIDTH - i - 1));
for (unsigned i = 0U; i != LIBC_NAMESPACE::cpp::numeric_limits<int>::digits;
++i)
EXPECT_EQ(
LIBC_NAMESPACE::stdc_bit_floor_ui(
LIBC_NAMESPACE::cpp::numeric_limits<unsigned int>::max() >> i),
1U << (LIBC_NAMESPACE::cpp::numeric_limits<unsigned int>::digits - i -
1));
}
10 changes: 6 additions & 4 deletions libc/test/src/stdbit/stdc_leading_zeros_ui_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
#include <stddef.h>

TEST(LlvmLibcStdcLeadingZerosUiTest, Zero) {
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_ui(0U),
static_cast<unsigned>(INT_WIDTH));
EXPECT_EQ(
LIBC_NAMESPACE::stdc_leading_zeros_ui(0U),
static_cast<unsigned>(LIBC_NAMESPACE::cpp::numeric_limits<int>::digits));
}

TEST(LlvmLibcStdcLeadingZerosUiTest, OneHot) {
for (unsigned i = 0U; i != INT_WIDTH; ++i)
for (unsigned i = 0U; i != LIBC_NAMESPACE::cpp::numeric_limits<int>::digits;
++i)
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_ui(1U << i),
INT_WIDTH - i - 1);
LIBC_NAMESPACE::cpp::numeric_limits<int>::digits - i - 1);
}