diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2018-12-01 15:41:59 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2018-12-01 15:41:59 +0000 |
commit | 9508e63251dce5a919900af04d18710eefa2809f (patch) | |
tree | 36372aea4318118f3ec29510700408deda5b0e9a | |
parent | 4cc398f0bc683cef092c5e8ba987f8c18b1294d0 (diff) |
Vendor import of lldb release_70 branch r348011:vendor/lldb/lldb-release_701-r349250vendor/lldb/lldb-release_70-r348686vendor/lldb/lldb-release_70-r348011vendor/lldb-70
Notes
Notes:
svn path=/vendor/lldb/dist-release_70/; revision=341372
svn path=/vendor/lldb/lldb-release_701-r349250/; revision=342122; tag=vendor/lldb/lldb-release_701-r349250
-rw-r--r-- | source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp index f44b2bb97b2b..d26556d73e28 100644 --- a/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp +++ b/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp @@ -261,7 +261,11 @@ void DWARFUnit::ExtractDIEsRWLocked() { } if (!m_die_array.empty()) { - lldbassert(!m_first_die || m_first_die == m_die_array.front()); + if (m_first_die) { + // Only needed for the assertion. + m_first_die.SetEmptyChildren(m_die_array.front().GetEmptyChildren()); + lldbassert(m_first_die == m_die_array.front()); + } m_first_die = m_die_array.front(); } |