Author: Felipe de Azevedo Piovezan Date: 2023-07-03T17:12:06-04:00 New Revision: f470ab734c9bae9464faf6cff6530beb32ea44ba
URL: https://github.com/llvm/llvm-project/commit/f470ab734c9bae9464faf6cff6530beb32ea44ba DIFF: https://github.com/llvm/llvm-project/commit/f470ab734c9bae9464faf6cff6530beb32ea44ba.diff LOG: [lldb][nfc] Remove redundant nullptr check The make_shared function never returns a nullptr, as such the test for nullptr is not needed. We also move the empty string check earlier in the if ("oso_object"), as this is cheaper than loading the object file. Differential Revision: https://reviews.llvm.org/D154365 Added: Modified: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp index 1d79b13a6633f0..131933777bf31c 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp @@ -471,18 +471,17 @@ Module *SymbolFileDWARFDebugMap::GetModuleByCompUnitInfo( oso_arch, oso_object ? &oso_object : nullptr, 0, oso_object ? comp_unit_info->oso_mod_time : llvm::sys::TimePoint<>()); - if (!comp_unit_info->oso_sp->module_sp || !comp_unit_info->oso_sp->module_sp->GetObjectFile()) { - if (oso_object && FileSystem::Instance().Exists(oso_file)) { - // If we are loading a .o file from a .a file the "oso_object" will - // have a valid value name and if the .a file exists, either the .o - // file didn't exist in the .a file or the mod time didn't match. - comp_unit_info->oso_load_error.SetErrorStringWithFormat( - "\"%s\" object from the \"%s\" archive: " - "either the .o file doesn't exist in the archive or the " - "modification time (0x%8.8x) of the .o file doesn't match", - oso_object.AsCString(), oso_file.GetPath().c_str(), - (uint32_t)llvm::sys::toTimeT(comp_unit_info->oso_mod_time)); - } + if (oso_object && !comp_unit_info->oso_sp->module_sp->GetObjectFile() && + FileSystem::Instance().Exists(oso_file)) { + // If we are loading a .o file from a .a file the "oso_object" will + // have a valid value name and if the .a file exists, either the .o + // file didn't exist in the .a file or the mod time didn't match. + comp_unit_info->oso_load_error.SetErrorStringWithFormat( + "\"%s\" object from the \"%s\" archive: " + "either the .o file doesn't exist in the archive or the " + "modification time (0x%8.8x) of the .o file doesn't match", + oso_object.AsCString(), oso_file.GetPath().c_str(), + (uint32_t)llvm::sys::toTimeT(comp_unit_info->oso_mod_time)); } } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
