shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[lldb] Use llvm::find_if (NFC) (#141385)

Browse Source
This commit is contained in:
Kazu Hirata 2025-05-25 08:21:30 -07:00 committed by GitHub
parent c4cfc95d76
commit ef29a79adf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lldb/include/lldb/Breakpoint/StopPointSiteList.h
View File

@ -278,9 +278,8 @@ protected:
[site_id](const std::pair<lldb::addr_t, StopPointSiteSP> s) {
return site_id == s.second->GetID();
};
return std::find_if(m_site_list.begin(),
m_site_list.end(), // Search full range
id_matches);
return llvm::find_if(m_site_list, // Search full range
id_matches);
}
typename collection::const_iterator
@ -290,9 +289,8 @@ protected:
[site_id](const std::pair<lldb::addr_t, StopPointSiteSP> s) {
return site_id == s.second->GetID();
};
return std::find_if(m_site_list.begin(),
m_site_list.end(), // Search full range
id_matches);
return llvm::find_if(m_site_list, // Search full range
id_matches);
}
mutable std::recursive_mutex m_mutex;

18
lldb/source/Breakpoint/BreakpointList.cpp
View File

@ -47,9 +47,9 @@ break_id_t BreakpointList::Add(BreakpointSP &bp_sp, bool notify) {
bool BreakpointList::Remove(break_id_t break_id, bool notify) {
std::lock_guard<std::recursive_mutex> guard(m_mutex);
auto it = std::find_if(
m_breakpoints.begin(), m_breakpoints.end(),
[&](const BreakpointSP &bp) { return bp->GetID() == break_id; });
auto it = llvm::find_if(m_breakpoints, [&](const BreakpointSP &bp) {
return bp->GetID() == break_id;
});
if (it == m_breakpoints.end())
return false;
@ -109,16 +109,16 @@ void BreakpointList::RemoveAllowed(bool notify) {
BreakpointList::bp_collection::iterator
BreakpointList::GetBreakpointIDIterator(break_id_t break_id) {
return std::find_if(
m_breakpoints.begin(), m_breakpoints.end(),
[&](const BreakpointSP &bp) { return bp->GetID() == break_id; });
return llvm::find_if(m_breakpoints, [&](const BreakpointSP &bp) {
return bp->GetID() == break_id;
});
}
BreakpointList::bp_collection::const_iterator
BreakpointList::GetBreakpointIDConstIterator(break_id_t break_id) const {
return std::find_if(
m_breakpoints.begin(), m_breakpoints.end(),
[&](const BreakpointSP &bp) { return bp->GetID() == break_id; });
return llvm::find_if(m_breakpoints, [&](const BreakpointSP &bp) {
return bp->GetID() == break_id;
});
}
BreakpointSP BreakpointList::FindBreakpointByID(break_id_t break_id) const {

10
lldb/source/Breakpoint/BreakpointLocationCollection.cpp
View File

@ -60,18 +60,16 @@ private:
BreakpointLocationCollection::collection::iterator
BreakpointLocationCollection::GetIDPairIterator(lldb::break_id_t break_id,
lldb::break_id_t break_loc_id) {
return std::find_if(
m_break_loc_collection.begin(),
m_break_loc_collection.end(), // Search full range
return llvm::find_if(
m_break_loc_collection, // Search full range
BreakpointIDPairMatches(break_id, break_loc_id)); // Predicate
}
BreakpointLocationCollection::collection::const_iterator
BreakpointLocationCollection::GetIDPairConstIterator(
lldb::break_id_t break_id, lldb::break_id_t break_loc_id) const {
return std::find_if(
m_break_loc_collection.begin(),
m_break_loc_collection.end(), // Search full range
return llvm::find_if(
m_break_loc_collection, // Search full range
BreakpointIDPairMatches(break_id, break_loc_id)); // Predicate
}

10
lldb/source/Breakpoint/WatchpointList.cpp
View File

@ -98,16 +98,14 @@ private:
WatchpointList::wp_collection::iterator
WatchpointList::GetIDIterator(lldb::watch_id_t watch_id) {
return std::find_if(m_watchpoints.begin(),
m_watchpoints.end(), // Search full range
WatchpointIDMatches(watch_id)); // Predicate
return llvm::find_if(m_watchpoints, // Search full range
WatchpointIDMatches(watch_id)); // Predicate
}
WatchpointList::wp_collection::const_iterator
WatchpointList::GetIDConstIterator(lldb::watch_id_t watch_id) const {
return std::find_if(m_watchpoints.begin(),
m_watchpoints.end(), // Search full range
WatchpointIDMatches(watch_id)); // Predicate
return llvm::find_if(m_watchpoints, // Search full range
WatchpointIDMatches(watch_id)); // Predicate
}
WatchpointSP WatchpointList::FindByID(lldb::watch_id_t watch_id) const {

6
lldb/source/Core/Debugger.cpp
View File

@ -2225,9 +2225,9 @@ void Debugger::HandleProgressEvent(const lldb::EventSP &event_sp) {
// progress reports.
{
std::lock_guard<std::mutex> guard(m_progress_reports_mutex);
auto it = std::find_if(
m_progress_reports.begin(), m_progress_reports.end(),
[&](const auto &report) { return report.id == progress_report.id; });
auto it = llvm::find_if(m_progress_reports, [&](const auto &report) {
return report.id == progress_report.id;
});
if (it != m_progress_reports.end()) {
const bool complete = data->GetCompleted() == data->GetTotal();
if (complete)

6
lldb/source/Core/PluginManager.cpp
View File

@ -315,9 +315,9 @@ public:
}
bool SetInstanceEnabled(llvm::StringRef name, bool enable) {
auto it = std::find_if(
m_instances.begin(), m_instances.end(),
[&](const Instance &instance) { return instance.name == name; });
auto it = llvm::find_if(m_instances, [&](const Instance &instance) {
return instance.name == name;
});
if (it == m_instances.end())
return false;

7
lldb/source/DataFormatters/TypeCategoryMap.cpp
View File

@ -112,9 +112,10 @@ void TypeCategoryMap::EnableAllCategories() {
continue;
auto pos = iter->second->GetLastEnabledPosition();
if (pos >= sorted_categories.size()) {
auto iter = std::find_if(
sorted_categories.begin(), sorted_categories.end(),
[](const TypeCategoryImplSP &sp) -> bool { return sp.get() == nullptr; });
auto iter = llvm::find_if(sorted_categories,
[](const TypeCategoryImplSP &sp) -> bool {
return sp.get() == nullptr;
});
pos = std::distance(sorted_categories.begin(), iter);
}
sorted_categories.at(pos) = iter->second;

25
lldb/source/Target/TargetList.cpp
View File

@ -382,8 +382,8 @@ bool TargetList::DeleteTarget(TargetSP &target_sp) {
TargetSP TargetList::FindTargetWithExecutableAndArchitecture(
const FileSpec &exe_file_spec, const ArchSpec *exe_arch_ptr) const {
std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex);
auto it = std::find_if(m_target_list.begin(), m_target_list.end(),
[&exe_file_spec, exe_arch_ptr](const TargetSP &item) {
auto it = llvm::find_if(
m_target_list, [&exe_file_spec, exe_arch_ptr](const TargetSP &item) {
Module *exe_module = item->GetExecutableModulePointer();
if (!exe_module ||
!FileSpec::Match(exe_file_spec, exe_module->GetFileSpec()))
@ -401,11 +401,10 @@ TargetSP TargetList::FindTargetWithExecutableAndArchitecture(
TargetSP TargetList::FindTargetWithProcessID(lldb::pid_t pid) const {
std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex);
auto it = std::find_if(m_target_list.begin(), m_target_list.end(),
[pid](const TargetSP &item) {
auto *process_ptr = item->GetProcessSP().get();
return process_ptr && (process_ptr->GetID() == pid);
});
auto it = llvm::find_if(m_target_list, [pid](const TargetSP &item) {
auto *process_ptr = item->GetProcessSP().get();
return process_ptr && (process_ptr->GetID() == pid);
});
if (it != m_target_list.end())
return *it;
@ -419,10 +418,9 @@ TargetSP TargetList::FindTargetWithProcess(Process *process) const {
return target_sp;
std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex);
auto it = std::find_if(m_target_list.begin(), m_target_list.end(),
[process](const TargetSP &item) {
return item->GetProcessSP().get() == process;
});
auto it = llvm::find_if(m_target_list, [process](const TargetSP &item) {
return item->GetProcessSP().get() == process;
});
if (it != m_target_list.end())
target_sp = *it;
@ -436,8 +434,9 @@ TargetSP TargetList::GetTargetSP(Target *target) const {
return target_sp;
std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex);
auto it = std::find_if(m_target_list.begin(), m_target_list.end(),
[target](const TargetSP &item) { return item.get() == target; });
auto it = llvm::find_if(m_target_list, [target](const TargetSP &item) {
return item.get() == target;
});
if (it != m_target_list.end())
target_sp = *it;