[Lldb-commits] [PATCH] D143564: [LLDB] Add missing newline to "image lookup" output

[David Spickett via Phabricator via lldb-commits]

DavidSpickett created this revision.
Herald added a project: All.
DavidSpickett requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.

When using --name, due to a missing newline, multiple symbol results
were not correctly printed:

  (lldb) image lookup -r -n "As<.*"
  2 matches found in <...>/tbi_lisp:
          Address: tbi_lisp<...>
          Summary: tbi_lisp<...> at Symbol.cpp:75        Address: tbi_lisp<...>
          Summary: tbi_lisp<...> at Symbol.cpp:82

It should be:

  (lldb) image lookup -r -n "As<.*"
  2 matches found in /home/david.spickett/tbi_lisp/tbi_lisp:
          Address: tbi_lisp<...>
          Summary: tbi_lisp<...> at Symbol.cpp:75
          Address: tbi_lisp<...>
          Summary: tbi_lisp<...> at Symbol.cpp:82

With Address/Summary on separate lines.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D143564

Files:
  lldb/source/Commands/CommandObjectTarget.cpp
  lldb/test/Shell/Commands/command-target-modules-lookup.test


Index: lldb/test/Shell/Commands/command-target-modules-lookup.test
===================================================================
--- lldb/test/Shell/Commands/command-target-modules-lookup.test
+++ lldb/test/Shell/Commands/command-target-modules-lookup.test
@@ -10,3 +10,10 @@
 # CHECK-NEXT: Summary: [[MODULE]]`someOtherFunc()
 # CHECK-NEXT: Address: [[MODULE]][0x0000000000000038] ([[MODULE]]..text + 56)
 # CHECK-NEXT: Summary: [[MODULE]]`someOtherFunc(double)
+
+# RUN: %lldb %t -b -o "target modules lookup -r -n \".*someFunc\"" | FileCheck 
%s -DMODULE=%basename_t.tmp --check-prefix CHECKFN
+# CHECKFN:     2 matches found in {{.*}}[[MODULE]]:
+# CHECKFN-NEXT: Address: [[MODULE]][0x0000000000000000] ([[MODULE]]..text + 0)
+# CHECKFN-NEXT: Summary: [[MODULE]]`someFunc(int, int, int)
+# CHECKFN-NEXT: Address: [[MODULE]][0x000000000000001c] ([[MODULE]]..text + 28)
+# CHECKFN-NEXT: Summary: [[MODULE]]`someFunc(char, int)
\ No newline at end of file
Index: lldb/source/Commands/CommandObjectTarget.cpp
===================================================================
--- lldb/source/Commands/CommandObjectTarget.cpp
+++ lldb/source/Commands/CommandObjectTarget.cpp
@@ -1582,6 +1582,8 @@
       sc.GetAddressRange(eSymbolContextEverything, 0, true, range);
 
       DumpAddress(exe_scope, range.GetBaseAddress(), verbose, all_ranges, 
strm);
+      if (i != (num_matches - 1))
+        strm.EOL();
     }
   }
   strm.IndentLess();



Index: lldb/test/Shell/Commands/command-target-modules-lookup.test
===================================================================
--- lldb/test/Shell/Commands/command-target-modules-lookup.test
+++ lldb/test/Shell/Commands/command-target-modules-lookup.test
@@ -10,3 +10,10 @@
 # CHECK-NEXT: Summary: [[MODULE]]`someOtherFunc()
 # CHECK-NEXT: Address: [[MODULE]][0x0000000000000038] ([[MODULE]]..text + 56)
 # CHECK-NEXT: Summary: [[MODULE]]`someOtherFunc(double)
+
+# RUN: %lldb %t -b -o "target modules lookup -r -n \".*someFunc\"" | FileCheck %s -DMODULE=%basename_t.tmp --check-prefix CHECKFN
+# CHECKFN:     2 matches found in {{.*}}[[MODULE]]:
+# CHECKFN-NEXT: Address: [[MODULE]][0x0000000000000000] ([[MODULE]]..text + 0)
+# CHECKFN-NEXT: Summary: [[MODULE]]`someFunc(int, int, int)
+# CHECKFN-NEXT: Address: [[MODULE]][0x000000000000001c] ([[MODULE]]..text + 28)
+# CHECKFN-NEXT: Summary: [[MODULE]]`someFunc(char, int)
\ No newline at end of file
Index: lldb/source/Commands/CommandObjectTarget.cpp
===================================================================
--- lldb/source/Commands/CommandObjectTarget.cpp
+++ lldb/source/Commands/CommandObjectTarget.cpp
@@ -1582,6 +1582,8 @@
       sc.GetAddressRange(eSymbolContextEverything, 0, true, range);
 
       DumpAddress(exe_scope, range.GetBaseAddress(), verbose, all_ranges, strm);
+      if (i != (num_matches - 1))
+        strm.EOL();
     }
   }
   strm.IndentLess();

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