fixup! search .o files when searching for module by UID

Author: Michael137

lldb/include/lldb/Core/ModuleList.h

@@ -352,14 +352,6 @@ class ModuleList {
   // UUID values is very efficient and accurate.
   lldb::ModuleSP FindModule(const UUID &uuid) const;
 
-  /// Find a module by LLDB-specific unique identifier.
-  ///
-  /// \param[in] uid The UID of the module assigned to it on construction.
-  ///
-  /// \returns ModuleSP of module with \c uid. Returns nullptr if no such
-  /// module could be found.
-  lldb::ModuleSP FindModule(lldb::user_id_t uid) const;
-
   /// Finds the first module whose file specification matches \a module_spec.
   lldb::ModuleSP FindFirstModule(const ModuleSpec &module_spec) const;
 

lldb/source/Core/ModuleList.cpp

@@ -584,20 +584,6 @@ ModuleSP ModuleList::FindModule(const UUID &uuid) const {
   return module_sp;
 }
 
-ModuleSP ModuleList::FindModule(lldb::user_id_t uid) const {
-  ModuleSP module_sp;
-  ForEach([&](const ModuleSP &m) {
-    if (m->GetID() == uid) {
-      module_sp = m;
-      return IterationAction::Stop;
-    }
-
-    return IterationAction::Continue;
-  });
-
-  return module_sp;
-}
-
 void ModuleList::FindTypes(Module *search_first, const TypeQuery &query,
                            TypeResults &results) const {
   std::lock_guard<std::recursive_mutex> guard(m_modules_mutex);

lldb/source/Expression/IRExecutionUnit.cpp

@@ -774,6 +774,36 @@ class LoadAddressResolver {
   lldb::addr_t m_best_internal_load_address = LLDB_INVALID_ADDRESS;
 };
 
+/// Find a module by LLDB-specific unique identifier.
+///
+/// \param[in] uid The UID of the module assigned to it on construction.
+///
+/// \returns ModuleSP of module with \c uid. Returns nullptr if no such
+/// module could be found.
+static lldb::ModuleSP FindDebugModule(lldb::user_id_t uid,
+                                      const ModuleList &modules) {
+  lldb::ModuleSP module_sp;
+  modules.ForEach([&](const lldb::ModuleSP &m) {
+    if (m->GetID() == uid) {
+      module_sp = m;
+      return IterationAction::Stop;
+    }
+
+    auto *sym = m->GetSymbolFile();
+    if (!sym)
+      return IterationAction::Continue;
+
+    auto debug_modules = sym->GetDebugInfoModules();
+    module_sp = FindDebugModule(uid, debug_modules);
+    if (module_sp)
+      return IterationAction::Stop;
+
+    return IterationAction::Continue;
+  });
+
+  return module_sp;
+}
+
 /// Returns address of the function referred to by the special function call
 /// label \c label.
 ///
@@ -799,8 +829,7 @@ ResolveFunctionCallLabel(llvm::StringRef name,
 
   const auto &label = *label_or_err;
 
-  auto module_sp = sc.target_sp->GetImages().FindModule(label.module_id);
-
+  auto module_sp = FindDebugModule(label.module_id, sc.target_sp->GetImages());
   if (!module_sp)
     return llvm::createStringError(
         llvm::formatv("failed to find module by UID {0}", label.module_id));