From 9508e63251dce5a919900af04d18710eefa2809f Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 1 Dec 2018 15:41:59 +0000 Subject: Vendor import of lldb release_70 branch r348011: https://llvm.org/svn/llvm-project/lldb/branches/release_70@348011 --- source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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(); } -- cgit v1.3