fixup! move to new FindModule API; make module UID atomic

Author: Michael137

lldb/include/lldb/Core/Module.h

@@ -98,7 +98,6 @@ class Module : public std::enable_shared_from_this<Module>,
   // using the "--global" (-g for short).
   static size_t GetNumberAllocatedModules();
 
-  static Module *GetAllocatedModuleWithUID(lldb::user_id_t uid);
   static Module *GetAllocatedModuleAtIndex(size_t idx);
 
   static std::recursive_mutex &GetAllocationModuleCollectionMutex();

lldb/include/lldb/Core/ModuleList.h

@@ -351,6 +351,14 @@ 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/Module.cpp

@@ -121,15 +121,6 @@ size_t Module::GetNumberAllocatedModules() {
   return GetModuleCollection().size();
 }
 
-Module *Module::GetAllocatedModuleWithUID(lldb::user_id_t uid) {
-  std::lock_guard<std::recursive_mutex> guard(
-      GetAllocationModuleCollectionMutex());
-  for (Module *mod : GetModuleCollection())
-    if (mod->GetID() == uid)
-      return mod;
-  return nullptr;
-}
-
 Module *Module::GetAllocatedModuleAtIndex(size_t idx) {
   std::lock_guard<std::recursive_mutex> guard(
       GetAllocationModuleCollectionMutex());
@@ -139,8 +130,7 @@ Module *Module::GetAllocatedModuleAtIndex(size_t idx) {
   return nullptr;
 }
 
-// TODO: needs a mutex
-static lldb::user_id_t g_unique_id = 1;
+static std::atomic<lldb::user_id_t> g_unique_id = 1;
 
 Module::Module(const ModuleSpec &module_spec)
     : UserID(g_unique_id++), m_unwind_table(*this), m_file_has_changed(false),

lldb/source/Core/ModuleList.cpp

@@ -584,6 +584,20 @@ 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 true;
+    }
+
+    return false;
+  });
+
+  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

@@ -809,16 +809,16 @@ ResolveFunctionCallLabel(llvm::StringRef name,
 
   const auto &label = *label_or_err;
 
-  Module *module = Module::GetAllocatedModuleWithUID(label.m_module_id);
+  auto module_sp = sc.target_sp->GetImages().FindModule(label.m_module_id);
 
-  if (!module)
+  if (!module_sp)
     return llvm::createStringError(
         llvm::formatv("failed to find module by UID {0}", label.m_module_id));
 
-  auto *symbol_file = module->GetSymbolFile();
+  auto *symbol_file = module_sp->GetSymbolFile();
   if (!symbol_file)
     return llvm::createStringError(
-        llvm::formatv("no SymbolFile found on module {0:x}.", module));
+        llvm::formatv("no SymbolFile found on module {0:x}.", module_sp.get()));
 
   SymbolContextList sc_list;
   if (auto err =