[Lldb-commits] [lldb] [lldb] Minor improvements to AddNamesMatchingPartialString (NFC) (PR #136760)

[Dave Lee via lldb-commits]

https://github.com/kastiglione updated 
https://github.com/llvm/llvm-project/pull/136760

>From ce512b778c9aad55c2fc0faef791cb3569a143eb Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee....@gmail.com>
Date: Fri, 18 Apr 2025 18:07:05 -0700
Subject: [PATCH 1/2] [lldb] Minor improvements to
 AddNamesMatchingPartialString (NFC)

---
 lldb/include/lldb/Interpreter/CommandObject.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lldb/include/lldb/Interpreter/CommandObject.h 
b/lldb/include/lldb/Interpreter/CommandObject.h
index e6fea9e022c43..a9ec43ea3a505 100644
--- a/lldb/include/lldb/Interpreter/CommandObject.h
+++ b/lldb/include/lldb/Interpreter/CommandObject.h
@@ -40,12 +40,11 @@ int AddNamesMatchingPartialString(
     StringList *descriptions = nullptr) {
   int number_added = 0;
 
-  const bool add_all = cmd_str.empty();
-
-  for (auto iter = in_map.begin(), end = in_map.end(); iter != end; iter++) {
-    if (add_all || (iter->first.find(std::string(cmd_str), 0) == 0)) {
+  for (const auto &iter : in_map) {
+    llvm::StringRef full_cmd = iter->first;
+    if (full_cmd.starts_with(cmd_str)) {
       ++number_added;
-      matches.AppendString(iter->first.c_str());
+      matches.AppendString(iter->first);
       if (descriptions)
         descriptions->AppendString(iter->second->GetHelp());
     }

>From 738c1827d2e190184c8aa614b6e76da3d6ce8ed5 Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee....@gmail.com>
Date: Tue, 22 Apr 2025 13:56:15 -0700
Subject: [PATCH 2/2] Fix iter member access

---
 lldb/include/lldb/Interpreter/CommandObject.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lldb/include/lldb/Interpreter/CommandObject.h 
b/lldb/include/lldb/Interpreter/CommandObject.h
index a9ec43ea3a505..8fb75ee4b1159 100644
--- a/lldb/include/lldb/Interpreter/CommandObject.h
+++ b/lldb/include/lldb/Interpreter/CommandObject.h
@@ -41,12 +41,12 @@ int AddNamesMatchingPartialString(
   int number_added = 0;
 
   for (const auto &iter : in_map) {
-    llvm::StringRef full_cmd = iter->first;
+    llvm::StringRef full_cmd = iter.first;
     if (full_cmd.starts_with(cmd_str)) {
       ++number_added;
-      matches.AppendString(iter->first);
+      matches.AppendString(iter.first);
       if (descriptions)
-        descriptions->AppendString(iter->second->GetHelp());
+        descriptions->AppendString(iter.second->GetHelp());
     }
   }
 

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits