Merge remote-tracking branch 'origin/main' into addmainunit3
authorJan Kratochvil <jan.kratochvil@redhat.com>
Sat, 16 Jan 2021 07:02:44 +0000 (08:02 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Sat, 16 Jan 2021 07:02:44 +0000 (08:02 +0100)
1  2 
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp

@@@ -350,9 -359,8 +359,8 @@@ void DWARFUnit::AddUnitDIE(const DWARFD
    if (!dwo_symbol_file)
      return;
  
-   uint64_t main_dwo_id =
-       cu_die.GetAttributeValueAsUnsigned(this, DW_AT_GNU_dwo_id, 0);
-   DWARFCompileUnit *dwo_cu = dwo_symbol_file->GetDWOCompileUnitForHash(main_dwo_id);
 -  DWARFUnit *dwo_cu = dwo_symbol_file->GetDWOCompileUnitForHash(m_dwo_id);
++  DWARFCompileUnit *dwo_cu = dwo_symbol_file->GetDWOCompileUnitForHash(m_dwo_id);
    if (!dwo_cu)
      return; // Can't fetch the compile unit from the dwo file.
    dwo_cu->SetUserData(this);