[Lldb-commits] [lldb] [lldb] Make VariableList::FindVariable const (NFC) (PR #195355)

[via lldb-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Dave Lee (kastiglione)

<details>
<summary>Changes</summary>



---
Full diff: https://github.com/llvm/llvm-project/pull/195355.diff


2 Files Affected:

- (modified) lldb/include/lldb/Symbol/VariableList.h (+3-4) 
- (modified) lldb/source/Symbol/VariableList.cpp (+12-24) 


``````````diff
diff --git a/lldb/include/lldb/Symbol/VariableList.h b/lldb/include/lldb/Symbol/VariableList.h
index ead300a815cb9..cacbe4cdde8fd 100644
--- a/lldb/include/lldb/Symbol/VariableList.h
+++ b/lldb/include/lldb/Symbol/VariableList.h
@@ -42,11 +42,10 @@ class VariableList {
   lldb::VariableSP RemoveVariableAtIndex(size_t idx);
 
   lldb::VariableSP FindVariable(ConstString name,
-                                bool include_static_members = true);
+                                bool include_static_members = true) const;
 
-  lldb::VariableSP FindVariable(ConstString name,
-                                lldb::ValueType value_type,
-                                bool include_static_members = true);
+  lldb::VariableSP FindVariable(ConstString name, lldb::ValueType value_type,
+                                bool include_static_members = true) const;
 
   uint32_t FindVariableIndex(const lldb::VariableSP &var_sp);
 
diff --git a/lldb/source/Symbol/VariableList.cpp b/lldb/source/Symbol/VariableList.cpp
index b7a396edd7011..9ee2994a3dc12 100644
--- a/lldb/source/Symbol/VariableList.cpp
+++ b/lldb/source/Symbol/VariableList.cpp
@@ -70,34 +70,22 @@ uint32_t VariableList::FindVariableIndex(const VariableSP &var_sp) {
 }
 
 VariableSP VariableList::FindVariable(ConstString name,
-                                      bool include_static_members) {
-  VariableSP var_sp;
-  iterator pos, end = m_variables.end();
-  for (pos = m_variables.begin(); pos != end; ++pos) {
-    if ((*pos)->NameMatches(name)) {
-      if (include_static_members || !(*pos)->IsStaticMember()) {
-        var_sp = (*pos);
-        break;
-      }
-    }
-  }
-  return var_sp;
+                                      bool include_static_members) const {
+  for (const auto &var_sp : m_variables)
+    if (var_sp->NameMatches(name))
+      if (include_static_members || !var_sp->IsStaticMember())
+        return var_sp;
+  return {};
 }
 
 VariableSP VariableList::FindVariable(ConstString name,
                                       lldb::ValueType value_type,
-                                      bool include_static_members) {
-  VariableSP var_sp;
-  iterator pos, end = m_variables.end();
-  for (pos = m_variables.begin(); pos != end; ++pos) {
-    if ((*pos)->NameMatches(name) && (*pos)->GetScope() == value_type) {
-      if (include_static_members || !(*pos)->IsStaticMember()) {
-        var_sp = (*pos);
-        break;
-      }
-    }
-  }
-  return var_sp;
+                                      bool include_static_members) const {
+  for (const auto &var_sp : m_variables)
+    if (var_sp->NameMatches(name) && var_sp->GetScope() == value_type)
+      if (include_static_members || !var_sp->IsStaticMember())
+        return var_sp;
+  return {};
 }
 
 size_t VariableList::AppendVariablesIfUnique(VariableList &var_list) {

``````````

</details>


https://github.com/llvm/llvm-project/pull/195355