Simplified return type of getBuildIDFromModule

[kwk]

Summary

Depends on D75750.

[kwk]

I didn't intend to create a new revision.

lldb/include/lldb/Host/DebugInfoD.h

 } // End of namespace llvm
 
 namespace lldb_private {
 
 namespace debuginfod {
   
 bool isAvailable();
 
-llvm::Expected<UUID> getBuildIDFromModule(const lldb::ModuleSP &module);
+UUID getBuildIDFromModule(const lldb::ModuleSP &module);
 
 llvm::Error findSource(UUID buildID, const std::string &path,
                        std::string &result_path);
 
 } // End of namespace debuginfod
 
 } // End of namespace lldb_private
 
 #endif // LLDB_HOST_DEBUGINFOD_H

lldb/source/Core/SourceManager.cpp

if (target) {
           m_file_spec = new_file_spec;
           m_mod_time = FileSystem::Instance().GetModificationTime(m_file_spec);
         }
       }
 
       // Try finding the file using elfutils' debuginfod
       if (!FileSystem::Instance().Exists(m_file_spec) &&
           debuginfod::isAvailable() && sc.module_sp) {
-        llvm::Expected<UUID> buildID =
-            debuginfod::getBuildIDFromModule(sc.module_sp);
-        if (auto err = buildID.takeError()) {
-          sc.module_sp->ReportWarning("An error occurred while getting the "
-                                      "build ID from the module: %s",
-                                      llvm::toString(std::move(err)).c_str());
-        } else {
-          std::string cache_path;
-          err = debuginfod::findSource(*buildID, file_spec.GetCString(),
-                                       cache_path);
-          if (err) {
-            sc.module_sp->ReportWarning("An error occurred while finding the "
-                                        "source file %s using debuginfod: %s",
-                                        file_spec.GetCString(),
-                                        llvm::toString(std::move(err)).c_str());
-          } else {
-            m_file_spec = FileSpec(cache_path);
-            m_mod_time = FileSystem::Instance().GetModificationTime(cache_path);
-          }
-        }
-      }
-    }
-  }
+        UUID buildID = debuginfod::getBuildIDFromModule(sc.module_sp);
+        llvm::Error err =
+            debuginfod::findSource(buildID, file_spec.GetCString(), cache_path);
 
   if (m_mod_time != llvm::sys::TimePoint<>())
     m_data_sp = FileSystem::Instance().CreateDataBuffer(m_file_spec);
 }
 
 uint32_t SourceManager::File::GetLineOffset(uint32_t line) {
   if (line == 0)
     return UINT32_MAX;

lldb/source/Host/common/DebugInfoD.cpp

 //===-- DebugInfoD.cpp ----------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Core/Module.h"
 #include "lldb/Host/Config.h"
 #include "lldb/Symbol/ObjectFile.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
+#include "lldb/Host/DebugInfoD.h"
 
 #if LLDB_ENABLE_DEBUGINFOD
 #include "elfutils/debuginfod.h"
 #endif
 
 namespace lldb_private {
 
 namespace debuginfod {
 
 using namespace lldb;
 using namespace lldb_private;
 
 #if !LLDB_ENABLE_DEBUGINFOD
 bool isAvailable() { return false; }
 
-llvm::Expected<UUID> getBuildIDFromModule(const ModuleSP &module) {
+UUID getBuildIDFromModule(const ModuleSP &module) {
   llvm_unreachable("debuginfod::getBuildIDFromModule is unavailable");
 };
 
 llvm::Error findSource(UUID buildID, const std::string &path,
                        std::string &cache_path, sys::TimePoint<> &mod_time) {
   llvm_unreachable("debuginfod::findSource is unavailable");
 }
 
 #else // LLDB_ENABLE_DEBUGINFOD
 
 bool isAvailable() { return true; }
 
-llvm::Expected<UUID> getBuildIDFromModule(const ModuleSP &module) {
+UUID getBuildIDFromModule(const ModuleSP &module) {
   UUID buildID;
 
   if (!module)
     return buildID;
 
   const FileSpec &moduleFileSpec = module->GetFileSpec();
   ModuleSpecList specList;
   size_t nSpecs =