Unverified Commit ff91bf82 authored by Dave Lee's avatar Dave Lee Committed by GitHub
Browse files

[lldb] Make VariableList::FindVariable const (NFC) (#195355) 

I was surprised to find `FindVariable` was not `const`. While making it
`const`, I also replaced the iterator based loop with a ranged based
loop.
parent 1baf1a02

lldb/include/lldb/Symbol/VariableList.h

+3 −4
Original line number Diff line number Diff line
@@ -42,11 +42,10 @@ public: 
  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);

lldb/source/Symbol/VariableList.cpp

+12 −24
Original line number Diff line number Diff line
@@ -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;

      }

    }

  }

                                      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;

      }

    }

  }

                                      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) {