[Lldb-commits] [PATCH] D154365: [lldb][nfc] Remove redundant nullptr check

[Felipe de Azevedo Piovezan via Phabricator via lldb-commits]

fdeazeve created this revision.
Herald added a project: All.
fdeazeve requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added subscribers: lldb-commits, jplehr, sstefan1.
Herald added a project: LLDB.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D154365

Files:
  lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp


Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
@@ -471,18 +471,17 @@
           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));
       }
     }
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D154365.536808.patch
Type: text/x-patch
Size: 2068 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20230703/db86bd96/attachment.bin>