Skip to content

Commit 8523c6a

Browse files
authored
[lldb] Actually use new SharedModuleList class (#162574)
Now that the use after free bug has been fixed (397181d), actually use the new SharedModuleList class.
1 parent 3c7873b commit 8523c6a

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
@@ -989,7 +989,7 @@ class SharedModuleList {
989989
};
990990

991991
struct SharedModuleListInfo {
992-
ModuleList module_list;
992+
SharedModuleList module_list;
993993
ModuleListProperties module_list_properties;
994994
};
995995
}
@@ -1007,7 +1007,7 @@ static SharedModuleListInfo &GetSharedModuleListInfo()
10071007
return *g_shared_module_list_info;
10081008
}
10091009

1010-
static ModuleList &GetSharedModuleList() {
1010+
static SharedModuleList &GetSharedModuleList() {
10111011
return GetSharedModuleListInfo().module_list;
10121012
}
10131013

@@ -1017,8 +1017,8 @@ ModuleListProperties &ModuleList::GetGlobalModuleListProperties() {
10171017

10181018
bool ModuleList::ModuleIsInCache(const Module *module_ptr) {
10191019
if (module_ptr) {
1020-
ModuleList &shared_module_list = GetSharedModuleList();
1021-
return shared_module_list.FindModule(module_ptr).get() != nullptr;
1020+
SharedModuleList &shared_module_list = GetSharedModuleList();
1021+
return shared_module_list.FindModule(*module_ptr).get() != nullptr;
10221022
}
10231023
return false;
10241024
}
@@ -1041,9 +1041,8 @@ ModuleList::GetSharedModule(const ModuleSpec &module_spec, ModuleSP &module_sp,
10411041
const FileSpecList *module_search_paths_ptr,
10421042
llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules,
10431043
bool *did_create_ptr, bool always_create) {
1044-
ModuleList &shared_module_list = GetSharedModuleList();
1045-
std::lock_guard<std::recursive_mutex> guard(
1046-
shared_module_list.m_modules_mutex);
1044+
SharedModuleList &shared_module_list = GetSharedModuleList();
1045+
std::lock_guard<std::recursive_mutex> guard(shared_module_list.GetMutex());
10471046
char path[PATH_MAX];
10481047

10491048
Status error;

0 commit comments

Comments
 (0)