Skip to content

Commit 93e423f

Browse files
[libc][test] update constants used in stdbit test (#83893)
Either: - I forgot my alphabet (that E comes before F). - My juvenile inner brain finds unsigned literal constants with the sequence FU funny. ¿Por qué no los dos?
1 parent 72cf95d commit 93e423f

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

libc/test/include/stdbit_test.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,60 +27,60 @@ unsigned stdc_leading_zeros_uc(unsigned char) noexcept { return 0xAAU; }
2727
unsigned stdc_leading_zeros_us(unsigned short) noexcept { return 0xABU; }
2828
unsigned stdc_leading_zeros_ui(unsigned) noexcept { return 0xACU; }
2929
unsigned stdc_leading_zeros_ul(unsigned long) noexcept { return 0xADU; }
30-
unsigned stdc_leading_zeros_ull(unsigned long long) noexcept { return 0xAFU; }
30+
unsigned stdc_leading_zeros_ull(unsigned long long) noexcept { return 0xAEU; }
3131
unsigned stdc_leading_ones_uc(unsigned char) noexcept { return 0xBAU; }
3232
unsigned stdc_leading_ones_us(unsigned short) noexcept { return 0xBBU; }
3333
unsigned stdc_leading_ones_ui(unsigned) noexcept { return 0xBCU; }
3434
unsigned stdc_leading_ones_ul(unsigned long) noexcept { return 0xBDU; }
35-
unsigned stdc_leading_ones_ull(unsigned long long) noexcept { return 0xBFU; }
35+
unsigned stdc_leading_ones_ull(unsigned long long) noexcept { return 0xBEU; }
3636
unsigned stdc_trailing_zeros_uc(unsigned char) noexcept { return 0xCAU; }
3737
unsigned stdc_trailing_zeros_us(unsigned short) noexcept { return 0xCBU; }
3838
unsigned stdc_trailing_zeros_ui(unsigned) noexcept { return 0xCCU; }
3939
unsigned stdc_trailing_zeros_ul(unsigned long) noexcept { return 0xCDU; }
40-
unsigned stdc_trailing_zeros_ull(unsigned long long) noexcept { return 0xCFU; }
40+
unsigned stdc_trailing_zeros_ull(unsigned long long) noexcept { return 0xCEU; }
4141
unsigned stdc_trailing_ones_uc(unsigned char) noexcept { return 0xDAU; }
4242
unsigned stdc_trailing_ones_us(unsigned short) noexcept { return 0xDBU; }
4343
unsigned stdc_trailing_ones_ui(unsigned) noexcept { return 0xDCU; }
4444
unsigned stdc_trailing_ones_ul(unsigned long) noexcept { return 0xDDU; }
45-
unsigned stdc_trailing_ones_ull(unsigned long long) noexcept { return 0xDFU; }
45+
unsigned stdc_trailing_ones_ull(unsigned long long) noexcept { return 0xDEU; }
4646
unsigned stdc_first_leading_zero_uc(unsigned char) noexcept { return 0xEAU; }
4747
unsigned stdc_first_leading_zero_us(unsigned short) noexcept { return 0xEBU; }
4848
unsigned stdc_first_leading_zero_ui(unsigned) noexcept { return 0xECU; }
4949
unsigned stdc_first_leading_zero_ul(unsigned long) noexcept { return 0xEDU; }
5050
unsigned stdc_first_leading_zero_ull(unsigned long long) noexcept {
51-
return 0xEFU;
51+
return 0xEEU;
5252
}
5353
unsigned stdc_first_leading_one_uc(unsigned char) noexcept { return 0xFAU; }
5454
unsigned stdc_first_leading_one_us(unsigned short) noexcept { return 0xFBU; }
5555
unsigned stdc_first_leading_one_ui(unsigned) noexcept { return 0xFCU; }
5656
unsigned stdc_first_leading_one_ul(unsigned long) noexcept { return 0xFDU; }
5757
unsigned stdc_first_leading_one_ull(unsigned long long) noexcept {
58-
return 0xFFU;
58+
return 0xFEU;
5959
}
6060
unsigned stdc_first_trailing_zero_uc(unsigned char) noexcept { return 0x0AU; }
6161
unsigned stdc_first_trailing_zero_us(unsigned short) noexcept { return 0x0BU; }
6262
unsigned stdc_first_trailing_zero_ui(unsigned) noexcept { return 0x0CU; }
6363
unsigned stdc_first_trailing_zero_ul(unsigned long) noexcept { return 0x0DU; }
6464
unsigned stdc_first_trailing_zero_ull(unsigned long long) noexcept {
65-
return 0x0FU;
65+
return 0x0EU;
6666
}
6767
unsigned stdc_first_trailing_one_uc(unsigned char) noexcept { return 0x1AU; }
6868
unsigned stdc_first_trailing_one_us(unsigned short) noexcept { return 0x1BU; }
6969
unsigned stdc_first_trailing_one_ui(unsigned) noexcept { return 0x1CU; }
7070
unsigned stdc_first_trailing_one_ul(unsigned long) noexcept { return 0x1DU; }
7171
unsigned stdc_first_trailing_one_ull(unsigned long long) noexcept {
72-
return 0x1FU;
72+
return 0x1EU;
7373
}
7474
unsigned stdc_count_zeros_uc(unsigned char) noexcept { return 0x2AU; }
7575
unsigned stdc_count_zeros_us(unsigned short) noexcept { return 0x2BU; }
7676
unsigned stdc_count_zeros_ui(unsigned) noexcept { return 0x2CU; }
7777
unsigned stdc_count_zeros_ul(unsigned long) noexcept { return 0x2DU; }
78-
unsigned stdc_count_zeros_ull(unsigned long long) noexcept { return 0x2FU; }
78+
unsigned stdc_count_zeros_ull(unsigned long long) noexcept { return 0x2EU; }
7979
unsigned stdc_count_ones_uc(unsigned char) noexcept { return 0x3AU; }
8080
unsigned stdc_count_ones_us(unsigned short) noexcept { return 0x3BU; }
8181
unsigned stdc_count_ones_ui(unsigned) noexcept { return 0x3CU; }
8282
unsigned stdc_count_ones_ul(unsigned long) noexcept { return 0x3DU; }
83-
unsigned stdc_count_ones_ull(unsigned long long) noexcept { return 0x3FU; }
83+
unsigned stdc_count_ones_ull(unsigned long long) noexcept { return 0x3EU; }
8484
bool stdc_has_single_bit_uc(unsigned char) noexcept { return false; }
8585
bool stdc_has_single_bit_us(unsigned short) noexcept { return false; }
8686
bool stdc_has_single_bit_ui(unsigned) noexcept { return false; }
@@ -95,79 +95,79 @@ TEST(LlvmLibcStdbitTest, TypeGenericMacroLeadingZeros) {
9595
EXPECT_EQ(stdc_leading_zeros(static_cast<unsigned short>(0U)), 0xABU);
9696
EXPECT_EQ(stdc_leading_zeros(0U), 0xACU);
9797
EXPECT_EQ(stdc_leading_zeros(0UL), 0xADU);
98-
EXPECT_EQ(stdc_leading_zeros(0ULL), 0xAFU);
98+
EXPECT_EQ(stdc_leading_zeros(0ULL), 0xAEU);
9999
}
100100

101101
TEST(LlvmLibcStdbitTest, TypeGenericMacroLeadingOnes) {
102102
EXPECT_EQ(stdc_leading_ones(static_cast<unsigned char>(0U)), 0xBAU);
103103
EXPECT_EQ(stdc_leading_ones(static_cast<unsigned short>(0U)), 0xBBU);
104104
EXPECT_EQ(stdc_leading_ones(0U), 0xBCU);
105105
EXPECT_EQ(stdc_leading_ones(0UL), 0xBDU);
106-
EXPECT_EQ(stdc_leading_ones(0ULL), 0xBFU);
106+
EXPECT_EQ(stdc_leading_ones(0ULL), 0xBEU);
107107
}
108108

109109
TEST(LlvmLibcStdbitTest, TypeGenericMacroTrailingZeros) {
110110
EXPECT_EQ(stdc_trailing_zeros(static_cast<unsigned char>(0U)), 0xCAU);
111111
EXPECT_EQ(stdc_trailing_zeros(static_cast<unsigned short>(0U)), 0xCBU);
112112
EXPECT_EQ(stdc_trailing_zeros(0U), 0xCCU);
113113
EXPECT_EQ(stdc_trailing_zeros(0UL), 0xCDU);
114-
EXPECT_EQ(stdc_trailing_zeros(0ULL), 0xCFU);
114+
EXPECT_EQ(stdc_trailing_zeros(0ULL), 0xCEU);
115115
}
116116

117117
TEST(LlvmLibcStdbitTest, TypeGenericMacroTrailingOnes) {
118118
EXPECT_EQ(stdc_trailing_ones(static_cast<unsigned char>(0U)), 0xDAU);
119119
EXPECT_EQ(stdc_trailing_ones(static_cast<unsigned short>(0U)), 0xDBU);
120120
EXPECT_EQ(stdc_trailing_ones(0U), 0xDCU);
121121
EXPECT_EQ(stdc_trailing_ones(0UL), 0xDDU);
122-
EXPECT_EQ(stdc_trailing_ones(0ULL), 0xDFU);
122+
EXPECT_EQ(stdc_trailing_ones(0ULL), 0xDEU);
123123
}
124124

125125
TEST(LlvmLibcStdbitTest, TypeGenericMacroFirstLeadingZero) {
126126
EXPECT_EQ(stdc_first_leading_zero(static_cast<unsigned char>(0U)), 0xEAU);
127127
EXPECT_EQ(stdc_first_leading_zero(static_cast<unsigned short>(0U)), 0xEBU);
128128
EXPECT_EQ(stdc_first_leading_zero(0U), 0xECU);
129129
EXPECT_EQ(stdc_first_leading_zero(0UL), 0xEDU);
130-
EXPECT_EQ(stdc_first_leading_zero(0ULL), 0xEFU);
130+
EXPECT_EQ(stdc_first_leading_zero(0ULL), 0xEEU);
131131
}
132132

133133
TEST(LlvmLibcStdbitTest, TypeGenericMacroFirstLeadingOne) {
134134
EXPECT_EQ(stdc_first_leading_one(static_cast<unsigned char>(0U)), 0xFAU);
135135
EXPECT_EQ(stdc_first_leading_one(static_cast<unsigned short>(0U)), 0xFBU);
136136
EXPECT_EQ(stdc_first_leading_one(0U), 0xFCU);
137137
EXPECT_EQ(stdc_first_leading_one(0UL), 0xFDU);
138-
EXPECT_EQ(stdc_first_leading_one(0ULL), 0xFFU);
138+
EXPECT_EQ(stdc_first_leading_one(0ULL), 0xFEU);
139139
}
140140

141141
TEST(LlvmLibcStdbitTest, TypeGenericMacroFirstTrailingZero) {
142142
EXPECT_EQ(stdc_first_trailing_zero(static_cast<unsigned char>(0U)), 0x0AU);
143143
EXPECT_EQ(stdc_first_trailing_zero(static_cast<unsigned short>(0U)), 0x0BU);
144144
EXPECT_EQ(stdc_first_trailing_zero(0U), 0x0CU);
145145
EXPECT_EQ(stdc_first_trailing_zero(0UL), 0x0DU);
146-
EXPECT_EQ(stdc_first_trailing_zero(0ULL), 0x0FU);
146+
EXPECT_EQ(stdc_first_trailing_zero(0ULL), 0x0EU);
147147
}
148148

149149
TEST(LlvmLibcStdbitTest, TypeGenericMacroFirstTrailingOne) {
150150
EXPECT_EQ(stdc_first_trailing_one(static_cast<unsigned char>(0U)), 0x1AU);
151151
EXPECT_EQ(stdc_first_trailing_one(static_cast<unsigned short>(0U)), 0x1BU);
152152
EXPECT_EQ(stdc_first_trailing_one(0U), 0x1CU);
153153
EXPECT_EQ(stdc_first_trailing_one(0UL), 0x1DU);
154-
EXPECT_EQ(stdc_first_trailing_one(0ULL), 0x1FU);
154+
EXPECT_EQ(stdc_first_trailing_one(0ULL), 0x1EU);
155155
}
156156

157157
TEST(LlvmLibcStdbitTest, TypeGenericMacroCountZeros) {
158158
EXPECT_EQ(stdc_count_zeros(static_cast<unsigned char>(0U)), 0x2AU);
159159
EXPECT_EQ(stdc_count_zeros(static_cast<unsigned short>(0U)), 0x2BU);
160160
EXPECT_EQ(stdc_count_zeros(0U), 0x2CU);
161161
EXPECT_EQ(stdc_count_zeros(0UL), 0x2DU);
162-
EXPECT_EQ(stdc_count_zeros(0ULL), 0x2FU);
162+
EXPECT_EQ(stdc_count_zeros(0ULL), 0x2EU);
163163
}
164164

165165
TEST(LlvmLibcStdbitTest, TypeGenericMacroCountOnes) {
166166
EXPECT_EQ(stdc_count_ones(static_cast<unsigned char>(0U)), 0x3AU);
167167
EXPECT_EQ(stdc_count_ones(static_cast<unsigned short>(0U)), 0x3BU);
168168
EXPECT_EQ(stdc_count_ones(0U), 0x3CU);
169169
EXPECT_EQ(stdc_count_ones(0UL), 0x3DU);
170-
EXPECT_EQ(stdc_count_ones(0ULL), 0x3FU);
170+
EXPECT_EQ(stdc_count_ones(0ULL), 0x3EU);
171171
}
172172

173173
TEST(LlvmLibcStdbitTest, TypeGenericMacroHasSingleBit) {

0 commit comments

Comments
 (0)