replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an issue where if you ask to search the global list of modules for a module with "target modules list", if it found a match in the current target, it would skip looking at the global list. Now if you ask for the global list, we use it and skip the target. 

llvm-svn: 160072
This commit is contained in:
Greg Clayton 2012-07-11 20:46:47 +00:00
parent 53eb7ad2f7
commit f315626fd6
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lldb/source/Commands/CommandObjectTarget.cpp
View File

@ -1743,27 +1743,7 @@ FindModulesByName (Target *target,
const size_t initial_size = module_list.GetSize ();
size_t num_matches = 0;
if (target)
{
num_matches = target->GetImages().FindModules (module_spec, module_list);
// Not found in our module list for our target, check the main
// shared module list in case it is a extra file used somewhere
// else
if (num_matches == 0)
{
module_spec.GetArchitecture() = target->GetArchitecture();
num_matches = ModuleList::FindSharedModules (module_spec, module_list);
}
}
else
{
num_matches = ModuleList::FindSharedModules (module_spec,module_list);
}
if (check_global_list && num_matches == 0)
if (check_global_list)
{
// Check the global list
Mutex::Locker locker(Module::GetAllocationModuleCollectionMutex());
@ -1783,6 +1763,27 @@ FindModulesByName (Target *target,
}
}
}
else
{
if (target)
{
const size_t num_matches = target->GetImages().FindModules (module_spec, module_list);
// Not found in our module list for our target, check the main
// shared module list in case it is a extra file used somewhere
// else
if (num_matches == 0)
{
module_spec.GetArchitecture() = target->GetArchitecture();
ModuleList::FindSharedModules (module_spec, module_list);
}
}
else
{
ModuleList::FindSharedModules (module_spec,module_list);
}
}
return module_list.GetSize () - initial_size;
}