Skip to content

Commit ba22dea

Browse files
Kevin Freikevinfrei
Kevin Frei
authored andcommitted
Address PR feedback from JDevlieghere
1 parent c2ca52d commit ba22dea

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4397,8 +4397,6 @@ const std::shared_ptr<SymbolFileDWARFDwo> &SymbolFileDWARF::GetDwpSymbolFile() {
43974397
module_spec.GetUUID() = m_objfile_sp->GetUUID();
43984398
dwp_filespec =
43994399
PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
4400-
// Set it back so it's not outliving the m_objfile_sp shared pointer.
4401-
module_spec.GetUUID() = {};
44024400
}
44034401
if (FileSystem::Instance().Exists(dwp_filespec)) {
44044402
LLDB_LOG(log, "Found DWP file: \"{0}\"", dwp_filespec);

lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ static bool IsDwpSymbolFile(const lldb::ModuleSP &module_sp,
5959
// a DWP file. Make sure we don't fill in the section list on dwp_obj_file
6060
// (by calling GetSectionList(false)) as this is invoked before we may have
6161
// all the symbol files collected and available.
62-
if (!dwp_obj_file || !dwp_obj_file->GetSectionList(false)->FindSectionByType(
63-
eSectionTypeDWARFDebugCuIndex, false))
64-
return false;
65-
return true;
62+
return dwp_obj_file && dwp_obj_file->GetSectionList(false)->FindSectionByType(
63+
eSectionTypeDWARFDebugCuIndex, false);
6664
}
6765

6866
// CreateInstance

0 commit comments

Comments
 (0)