intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-02 02:00:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libc++] Use unsigned char in basic_string::__short again

Browse Source 
D125496 changed the string layout on windows. Change `__is_long_` and `__size_` back to using `unsigned char` to fix the issue.

Reviewed By: Mordante, #libc

Spies: jloser, libcxx-commits, ayzhao

Differential Revision: https://reviews.llvm.org/D127566
This commit is contained in:
Nikolas Klauser
2022-06-11 23:43:00 +02:00
parent 571ae1abeb
commit 0d108f7908
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcxx/include/string
View File

@@ -692,8 +692,8 @@ private:
{
value_type __data_[__min_cap];
unsigned char __padding_[sizeof(value_type) - 1];
size_type __size_ : 7;
size_type __is_long_ : 1;
unsigned char __size_ : 7;
unsigned char __is_long_ : 1;
};
// The __endian_factor is required because the field we use to store the size
@@ -736,14 +736,16 @@ private:
struct __short
{
size_type __is_long_ : 1;
size_type __size_ : 7;
unsigned char __is_long_ : 1;
unsigned char __size_ : 7;
char __padding_[sizeof(value_type) - 1];
value_type __data_[__min_cap];
};
#endif // _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
static_assert(sizeof(__short) == (sizeof(value_type) * (__min_cap + 1)), "__short has an unexpected size.");
union __ulx{__long __lx; __short __lxx;};
enum {__n_words = sizeof(__ulx) / sizeof(size_type)};