OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Recent builds of libcxx actually wrap an std::map's children values in a union containing either a member named __cc, or either of __cc and __nc (const vs. non-const). This level of wrapping is quite useless for LLDB to show to people, so try to detect it, and filter it out 

llvm-svn: 217651
This commit is contained in:
Enrico Granata 2014-09-12 00:55:37 +00:00
parent ad0184056f
commit 340fa53411
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lldb/source/DataFormatters/LibCxxMap.cpp
View File

@ -302,6 +302,10 @@ lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetValueOffset (const l
lldb::ValueObjectSP lldb::ValueObjectSP
lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetChildAtIndex (size_t idx) lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetChildAtIndex (size_t idx)
{ {
static ConstString g___cc("__cc");
static ConstString g___nc("__nc");
if (idx >= CalculateNumChildren()) if (idx >= CalculateNumChildren())
return lldb::ValueObjectSP(); return lldb::ValueObjectSP();
if (m_tree == NULL || m_root_node == NULL) if (m_tree == NULL || m_root_node == NULL)
@ -375,7 +379,31 @@ lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetChildAtIndex (size_t
} }
StreamString name; StreamString name;
name.Printf("[%" PRIu64 "]", (uint64_t)idx); name.Printf("[%" PRIu64 "]", (uint64_t)idx);
return (m_children[idx] = ValueObject::CreateValueObjectFromData(name.GetData(), data, m_backend.GetExecutionContextRef(), m_element_type)); auto potential_child_sp = ValueObject::CreateValueObjectFromData(name.GetData(), data, m_backend.GetExecutionContextRef(), m_element_type);
if (potential_child_sp)
{
switch (potential_child_sp->GetNumChildren())
{
case 1:
{
auto child0_sp = potential_child_sp->GetChildAtIndex(0, true);
if (child0_sp && child0_sp->GetName() == g___cc)
potential_child_sp = child0_sp;
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)
potential_child_sp = child0_sp;
break;
}
}
potential_child_sp->SetName(ConstString(name.GetData()));
}
return (m_children[idx] = potential_child_sp);
} }
bool bool