diff options
| author | Adrian Prantl <aprantl@apple.com> | 2022-09-09 15:58:14 -0700 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2022-09-09 15:58:55 -0700 |
| commit | 2f4a66eed68804929efa1ad3c10fc040a67fb3ff (patch) | |
| tree | fa6a892a172af2b3c9e82edcc3512c098efff011 /lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp | |
| parent | 058f17d3afdf77474936b78a3611fe897f9890f8 (diff) | |
| download | llvm-2f4a66eed68804929efa1ad3c10fc040a67fb3ff.zip llvm-2f4a66eed68804929efa1ad3c10fc040a67fb3ff.tar.gz llvm-2f4a66eed68804929efa1ad3c10fc040a67fb3ff.tar.bz2 | |
Adapt LLDB dataformatters for libcxx change D129386
Differential Revision: https://reviews.llvm.org/D133618
Diffstat (limited to 'lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp')
| -rw-r--r-- | lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp index ca6f92d..04033df 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp @@ -328,7 +328,7 @@ void lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetValueOffset( lldb::ValueObjectSP lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetChildAtIndex( size_t idx) { - static ConstString g_cc("__cc"); + static ConstString g_cc_("__cc_"), g_cc("__cc"); static ConstString g_nc("__nc"); static ConstString g_value_("__value_"); @@ -414,15 +414,17 @@ lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetChildAtIndex( switch (potential_child_sp->GetNumChildren()) { case 1: { auto child0_sp = potential_child_sp->GetChildAtIndex(0, true); - if (child0_sp && child0_sp->GetName() == g_cc) + if (child0_sp && + (child0_sp->GetName() == g_cc_ || child0_sp->GetName() == g_cc)) potential_child_sp = child0_sp->Clone(ConstString(name.GetString())); break; } case 2: { auto child0_sp = potential_child_sp->GetChildAtIndex(0, true); auto child1_sp = potential_child_sp->GetChildAtIndex(1, true); - if (child0_sp && child0_sp->GetName() == g_cc && child1_sp && - child1_sp->GetName() == g_nc) + if (child0_sp && + (child0_sp->GetName() == g_cc_ || child0_sp->GetName() == g_cc) && + child1_sp && child1_sp->GetName() == g_nc) potential_child_sp = child0_sp->Clone(ConstString(name.GetString())); break; } |