Skip to content

[libc] Moved shared constexpr to the top #144569

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 3 commits into from
Jun 17, 2025
Merged

[libc] Moved shared constexpr to the top #144569

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2163dca
[libc] Moved shared constexpr to the top
Jun 17, 2025
e576531
fixed formatting
Jun 17, 2025
6afa771
added comment
Jun 17, 2025
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
17 changes: 8 additions & 9 deletions libc/src/__support/wchar/character_converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@
namespace LIBC_NAMESPACE_DECL {
namespace internal {

// This is for utf-8 bytes other than the first byte
constexpr size_t ENCODED_BITS_PER_UTF8 = 6;
// The number of bits per utf-8 byte that actually encode character
// Information not metadata (# of bits excluding the byte headers)
constexpr uint32_t MASK_ENCODED_BITS =
mask_trailing_ones<uint32_t, ENCODED_BITS_PER_UTF8>();

CharacterConverter::CharacterConverter(mbstate *mbstate) { state = mbstate; }

void CharacterConverter::clear() {
Expand Down Expand Up @@ -61,10 +68,8 @@ int CharacterConverter::push(char8_t utf8_byte) {
}
// Any subsequent push
// Adding 6 more bits so need to left shift
constexpr size_t ENCODED_BITS_PER_UTF8 = 6;
if (num_ones == 1 && !isComplete()) {
char32_t byte =
utf8_byte & mask_trailing_ones<uint32_t, ENCODED_BITS_PER_UTF8>();
char32_t byte = utf8_byte & MASK_ENCODED_BITS;
state->partial = state->partial << ENCODED_BITS_PER_UTF8;
state->partial |= byte;
state->bytes_processed++;
Expand Down Expand Up @@ -117,12 +122,6 @@ ErrorOr<char8_t> CharacterConverter::pop_utf8() {
constexpr char8_t FIRST_BYTE_HEADERS[] = {0, 0xC0, 0xE0, 0xF0};
constexpr char8_t CONTINUING_BYTE_HEADER = 0x80;

// the number of bits per utf-8 byte that actually encode character
// information not metadata (# of bits excluding the byte headers)
constexpr size_t ENCODED_BITS_PER_UTF8 = 6;
constexpr int MASK_ENCODED_BITS =
mask_trailing_ones<unsigned int, ENCODED_BITS_PER_UTF8>();

char32_t output;

// Shift to get the next 6 bits from the utf32 encoding
Expand Down
Loading