Skip to content

Commit ab65bf8

Browse files
committed
[lldb] Actually use new SharedModuleList class (llvm#162574)
Now that the use after free bug has been fixed (397181d), actually use the new SharedModuleList class. (cherry picked from commit 8523c6a)
1 parent 84d4435 commit ab65bf8

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

lldb/source/Core/ModuleList.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ class SharedModuleList {
12511251
};
12521252

12531253
struct SharedModuleListInfo {
1254-
ModuleList module_list;
1254+
SharedModuleList module_list;
12551255
ModuleListProperties module_list_properties;
12561256
};
12571257
}
@@ -1269,7 +1269,7 @@ static SharedModuleListInfo &GetSharedModuleListInfo()
12691269
return *g_shared_module_list_info;
12701270
}
12711271

1272-
static ModuleList &GetSharedModuleList() {
1272+
static SharedModuleList &GetSharedModuleList() {
12731273
return GetSharedModuleListInfo().module_list;
12741274
}
12751275

@@ -1279,8 +1279,8 @@ ModuleListProperties &ModuleList::GetGlobalModuleListProperties() {
12791279

12801280
bool ModuleList::ModuleIsInCache(const Module *module_ptr) {
12811281
if (module_ptr) {
1282-
ModuleList &shared_module_list = GetSharedModuleList();
1283-
return shared_module_list.FindModule(module_ptr).get() != nullptr;
1282+
SharedModuleList &shared_module_list = GetSharedModuleList();
1283+
return shared_module_list.FindModule(*module_ptr).get() != nullptr;
12841284
}
12851285
return false;
12861286
}
@@ -1303,9 +1303,8 @@ ModuleList::GetSharedModule(const ModuleSpec &module_spec, ModuleSP &module_sp,
13031303
const FileSpecList *module_search_paths_ptr,
13041304
llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules,
13051305
bool *did_create_ptr, bool always_create) {
1306-
ModuleList &shared_module_list = GetSharedModuleList();
1307-
std::lock_guard<std::recursive_mutex> guard(
1308-
shared_module_list.m_modules_mutex);
1306+
SharedModuleList &shared_module_list = GetSharedModuleList();
1307+
std::lock_guard<std::recursive_mutex> guard(shared_module_list.GetMutex());
13091308
char path[PATH_MAX];
13101309

13111310
Status error;

0 commit comments

Comments
 (0)