maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lldb] Adjust libc++ string formatter for changes in D122598 

The __size_ member is now in a slightly different location.
This commit is contained in:
Pavel Labath 2022-04-12 15:41:45 +02:00
parent f9c2f821d7
commit 45428412fd
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
View File

@ -578,17 +578,21 @@ ExtractLibcxxStringInfo(ValueObject &valobj) {
uint64_t size_mode_value = 0;
if (layout == eLibcxxStringLayoutModeDSC) {
ValueObjectSP size_mode(D->GetChildAtIndexPath({1, 1, 0}));
llvm::SmallVector<size_t, 3> size_mode_locations[] = {
{1, 2}, // Post-c3d0205ee771 layout
{1, 1, 0},
{1, 1, 1},
};
ValueObjectSP size_mode;
for (llvm::ArrayRef<size_t> loc : size_mode_locations) {
size_mode = D->GetChildAtIndexPath(loc);
if (size_mode && size_mode->GetName() == g_size_name)
break;
}
if (!size_mode)
return {};
if (size_mode->GetName() != g_size_name) {
// we are hitting the padding structure, move along
size_mode = D->GetChildAtIndexPath({1, 1, 1});
if (!size_mode)
return {};
}
size_mode_value = (size_mode->GetValueAsUnsigned(0));
short_mode = ((size_mode_value & 0x80) == 0);
} else {