shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[libc++] Add parentheses around shift operations in bitwise expressions (#175407)

Browse Source 
This improves consistency within files that already use this style.
This commit is contained in:
Fady Farag 2026-01-14 16:36:33 -06:00 committed by GitHub
parent d0c87356d1
commit d4469292bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/include/__bit/byteswap.h
View File

@ -37,7 +37,7 @@ template <integral _Tp>
# if __has_builtin(__builtin_bswap128)
return __builtin_bswap128(__val);
# else
return static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val))) << 64 |
return (static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val))) << 64) |
static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val >> 64)));
# endif // __has_builtin(__builtin_bswap128)
# endif // _LIBCPP_HAS_INT128

24
libcxx/src/locale.cpp
View File

@ -2318,7 +2318,7 @@ static codecvt_base::result utf16be_to_ucs4(
frm_nxt += 2;
}
for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 | frm_nxt[1]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) | frm_nxt[1]);
if ((c1 & 0xFC00) == 0xDC00)
return codecvt_base::error;
if ((c1 & 0xFC00) != 0xD800) {
@ -2329,7 +2329,7 @@ static codecvt_base::result utf16be_to_ucs4(
} else {
if (frm_end - frm_nxt < 4)
return codecvt_base::partial;
uint16_t c2 = static_cast<uint16_t>(frm_nxt[2] << 8 | frm_nxt[3]);
uint16_t c2 = static_cast<uint16_t>((frm_nxt[2] << 8) | frm_nxt[3]);
if ((c2 & 0xFC00) != 0xDC00)
return codecvt_base::error;
uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) | ((c1 & 0x003F) << 10) | (c2 & 0x03FF));
@ -2354,7 +2354,7 @@ static int utf16be_to_ucs4_length(
frm_nxt += 2;
}
for (size_t nchar32_t = 0; frm_nxt < frm_end - 1 && nchar32_t < mx; ++nchar32_t) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 | frm_nxt[1]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) | frm_nxt[1]);
if ((c1 & 0xFC00) == 0xDC00)
break;
if ((c1 & 0xFC00) != 0xD800) {
@ -2364,7 +2364,7 @@ static int utf16be_to_ucs4_length(
} else {
if (frm_end - frm_nxt < 4)
break;
uint16_t c2 = static_cast<uint16_t>(frm_nxt[2] << 8 | frm_nxt[3]);
uint16_t c2 = static_cast<uint16_t>((frm_nxt[2] << 8) | frm_nxt[3]);
if ((c2 & 0xFC00) != 0xDC00)
break;
uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) | ((c1 & 0x003F) << 10) | (c2 & 0x03FF));
@ -2432,7 +2432,7 @@ static codecvt_base::result utf16le_to_ucs4(
frm_nxt += 2;
}
for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 | frm_nxt[0]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) | frm_nxt[0]);
if ((c1 & 0xFC00) == 0xDC00)
return codecvt_base::error;
if ((c1 & 0xFC00) != 0xD800) {
@ -2443,7 +2443,7 @@ static codecvt_base::result utf16le_to_ucs4(
} else {
if (frm_end - frm_nxt < 4)
return codecvt_base::partial;
uint16_t c2 = static_cast<uint16_t>(frm_nxt[3] << 8 | frm_nxt[2]);
uint16_t c2 = static_cast<uint16_t>((frm_nxt[3] << 8) | frm_nxt[2]);
if ((c2 & 0xFC00) != 0xDC00)
return codecvt_base::error;
uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) | ((c1 & 0x003F) << 10) | (c2 & 0x03FF));
@ -2468,7 +2468,7 @@ static int utf16le_to_ucs4_length(
frm_nxt += 2;
}
for (size_t nchar32_t = 0; frm_nxt < frm_end - 1 && nchar32_t < mx; ++nchar32_t) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 | frm_nxt[0]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) | frm_nxt[0]);
if ((c1 & 0xFC00) == 0xDC00)
break;
if ((c1 & 0xFC00) != 0xD800) {
@ -2478,7 +2478,7 @@ static int utf16le_to_ucs4_length(
} else {
if (frm_end - frm_nxt < 4)
break;
uint16_t c2 = static_cast<uint16_t>(frm_nxt[3] << 8 | frm_nxt[2]);
uint16_t c2 = static_cast<uint16_t>((frm_nxt[3] << 8) | frm_nxt[2]);
if ((c2 & 0xFC00) != 0xDC00)
break;
uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) | ((c1 & 0x003F) << 10) | (c2 & 0x03FF));
@ -2535,7 +2535,7 @@ static codecvt_base::result utf16be_to_ucs2(
frm_nxt += 2;
}
for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 | frm_nxt[1]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) | frm_nxt[1]);
if ((c1 & 0xF800) == 0xD800 || c1 > Maxcode)
return codecvt_base::error;
*to_nxt = c1;
@ -2556,7 +2556,7 @@ static int utf16be_to_ucs2_length(
frm_nxt += 2;
}
for (size_t nchar16_t = 0; frm_nxt < frm_end - 1 && nchar16_t < mx; ++nchar16_t) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 | frm_nxt[1]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) | frm_nxt[1]);
if ((c1 & 0xF800) == 0xD800 || c1 > Maxcode)
break;
frm_nxt += 2;
@ -2609,7 +2609,7 @@ static codecvt_base::result utf16le_to_ucs2(
frm_nxt += 2;
}
for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 | frm_nxt[0]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) | frm_nxt[0]);
if ((c1 & 0xF800) == 0xD800 || c1 > Maxcode)
return codecvt_base::error;
*to_nxt = c1;
@ -2631,7 +2631,7 @@ static int utf16le_to_ucs2_length(
frm_nxt += 2;
}
for (size_t nchar16_t = 0; frm_nxt < frm_end - 1 && nchar16_t < mx; ++nchar16_t) {
uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 | frm_nxt[0]);
uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) | frm_nxt[0]);
if ((c1 & 0xF800) == 0xD800 || c1 > Maxcode)
break;
frm_nxt += 2;

6
libcxx/test/support/concat_macros.h
View File

@ -60,7 +60,7 @@ void test_encode(OutIt& out_it, char16_t value) {
*out_it++ = static_cast<char>(0b10000000 | (value & 0b00111111));
} else {
*out_it++ = static_cast<char>(0b11100000 | (value >> 12));
*out_it++ = static_cast<char>(0b10000000 | ((value) >> 6 & 0b00111111));
*out_it++ = static_cast<char>(0b10000000 | ((value >> 6) & 0b00111111));
*out_it++ = static_cast<char>(0b10000000 | (value & 0b00111111));
}
}
@ -72,8 +72,8 @@ void test_encode(OutIt& out_it, char32_t value) {
test_encode(out_it, static_cast<char16_t>(value));
else {
*out_it++ = static_cast<char>(0b11100000 | (value >> 18));
*out_it++ = static_cast<char>(0b10000000 | ((value) >> 12 & 0b00111111));
*out_it++ = static_cast<char>(0b10000000 | ((value) >> 6 & 0b00111111));
*out_it++ = static_cast<char>(0b10000000 | ((value >> 12) & 0b00111111));
*out_it++ = static_cast<char>(0b10000000 | ((value >> 6) & 0b00111111));
*out_it++ = static_cast<char>(0b10000000 | (value & 0b00111111));
}
}