diff options
| author | Pavel Labath <labath@google.com> | 2017-11-07 22:17:29 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2017-11-07 22:17:29 +0000 |
| commit | 4c0461f8ce263a95c80d5c58594dfd2435ee6cbf (patch) | |
| tree | 6d6765180f2e05ec07bb39d44ec50923c8d79ab2 /lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp | |
| parent | da9e0bd3a238f80b05a3070c8a8a3cadadc12e5f (diff) | |
| download | bcm5719-llvm-4c0461f8ce263a95c80d5c58594dfd2435ee6cbf.tar.gz bcm5719-llvm-4c0461f8ce263a95c80d5c58594dfd2435ee6cbf.zip | |
Update tuple/list/deque data formatters to work with newest libc++
Summary:
A couple of members of these data structures have been renamed in recent
months. This makes sure they still work with the latest libc++ version.
Reviewers: jingham, EricWF
Subscribers: lldb-commits
Differential Revision: https://reviews.llvm.org/D39602
llvm-svn: 317624
Diffstat (limited to 'lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp')
| -rw-r--r-- | lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp index aaf90605171..9b412a12f53 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp @@ -38,7 +38,11 @@ private: bool TupleFrontEnd::Update() { m_elements.clear(); - m_base_sp = m_backend.GetChildMemberWithName(ConstString("base_"), true); + m_base_sp = m_backend.GetChildMemberWithName(ConstString("__base_"), true); + if (! m_base_sp) { + // Pre r304382 name of the base element. + m_base_sp = m_backend.GetChildMemberWithName(ConstString("base_"), true); + } if (! m_base_sp) return false; m_elements.assign(m_base_sp->GetCompilerType().GetNumDirectBaseClasses(), |
