[lldb-mi] Re-implement symbol-list-lines command.

[apolyakov]

Summary

Now this command uses SB API instead of HandleCommand.

[aprantl]

This is going to be really nice!

tools/lldb-mi/MICmdCmdSymbol.cpp

24

Please remove the inline keyword. LLVM will inline if it's profitable anyway.
Also: could this be a constructor of CMImnMIValueTuple?

[apolyakov]

tools/lldb-mi/MICmdCmdSymbol.cpp

24

I think it could not. There are specific strings like "0x", "pc", "line" in this function which don't have any relation to CMICmnMIValueTuple class. Also, passing them as arguments doesn't seem like a good way. But it can be discussed, maybe someone will suggest a good approach for dealing with it.

[clayborg]

I am ok with the content of this. I will let Adrian give the final OK due to lit stuff.

[clayborg]

I am ok with the content of this. I will let Adrian give the final OK due to lit stuff.

[aprantl]

LGTM with the inline keyword removed.

tools/lldb-mi/MICmdCmdSymbol.cpp

24

I see in that case keeping it local to this file seems like the better approach.

[apolyakov]

Removed inline keyword.

[apolyakov]

Removed sb_target.IsDummy() since IsDummy won't be a member of SBTarget class. Now sb_target == rSessionInfo.GetDebugger().GetDummyTarget() is used for this goal.

[stella.stamenova]

symbol-list-lines.test fails on windows. I'm trying to get through the rest of the failing tests on Windows, so I can add a bot to run the tests and alert on new failures.

         ********************
         FAIL: lldb :: tools/lldb-mi/symbol/symbol-list-lines.test (45 of 1063)
         ******************** TEST 'lldb :: tools/lldb-mi/symbol/symbol-list-lines.test' FAILED ********************
         Script:
         --
         : 'RUN: at line 1';   E:/_work/4/b/LLVMBuild/Release/bin/clang.exe -o E:\_work\4\b\LLVMBuild\tools\lldb\lit\tools\lldb-mi\symbol\Output\symbol-list-lines.test.tmp E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol/inputs/main.c E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol/inputs/symbol-list-lines.c E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol/inputs/list-lines-helper.c -g
         : 'RUN: at line 2';   E:\_work\4\b\LLVMBuild\Release\bin\lldb-mi.EXE --synchronous E:\_work\4\b\LLVMBuild\tools\lldb\lit\tools\lldb-mi\symbol\Output\symbol-list-lines.test.tmp < E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol\symbol-list-lines.test | E:\_work\4\b\LLVMBuild\Release\bin\FileCheck.EXE E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol\symbol-list-lines.test
         --
         Exit Code: 1
         
         Command Output (stdout):
         --
         $ ":" "RUN: at line 1"
         $ "E:/_work/4/b/LLVMBuild/Release/bin/clang.exe" "-o" "E:\_work\4\b\LLVMBuild\tools\lldb\lit\tools\lldb-mi\symbol\Output\symbol-list-lines.test.tmp" "E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol/inputs/main.c" "E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol/inputs/symbol-list-lines.c" "E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol/inputs/list-lines-helper.c" "-g"
         $ ":" "RUN: at line 2"
         $ "E:\_work\4\b\LLVMBuild\Release\bin\lldb-mi.EXE" "--synchronous" "E:\_work\4\b\LLVMBuild\tools\lldb\lit\tools\lldb-mi\symbol\Output\symbol-list-lines.test.tmp"
         $ "E:\_work\4\b\LLVMBuild\Release\bin\FileCheck.EXE" "E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol\symbol-list-lines.test"
         # command stderr:
##[error]llvm\tools\lldb\lit\tools\lldb-mi\symbol\symbol-list-lines.test(14,10): Error G8E235623: expected string not found in input
     3>E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol\symbol-list-lines.test(14,10): error G8E235623: expected string not found in input [E:\_work\4\b\LLVMBuild\tools\lldb\lit\check-lldb-lit.vcxproj]
         
         # CHECK: ^done,lines=[{pc="0x{{[0-9A-Fa-f]+}}",line="3"},{pc="0x{{[0-9A-Fa-f]+}}",line="4"},{pc="0x{{[0-9A-Fa-f]+}}",line="5"}]
         
                  ^
         
         <stdin>:17:1: note: scanning from here
         
         (gdb)
         
         ^

[apolyakov]

Could you please provide an output of this command on Windows: E:\_work\4\b\LLVMBuild\Release\bin\lldb-mi.EXE --synchronous E:\_work\4\b\LLVMBuild\tools\lldb\lit\tools\lldb-mi\symbol\Output\symbol-list-lines.test.tmp < E:\_work\4\s\llvm\tools\lldb\lit\tools\lldb-mi\symbol\symbol-list-lines.test? I'll try to find out what causes a failure.

[stella.stamenova]

(gdb)
-file-exec-and-symbols "E:\\_work\\4\\b\\LLVMBuild\\tools\\lldb\\lit\\tools\\lldb-mi\\symbol\\Output\\symbol-list-lines.test.tmp"
^done
(gdb)
^done
(gdb)
=library-loaded,id="E:\\_work\\4\\b\\LLVMBuild\\tools\\lldb\\lit\\tools\\lldb-mi\\symbol\\Output\\symbol-list-lines.test.tmp",target-name="E:\\_work\\4\\b\\LLVMBuild\\tools\\lldb\\lit\\tools\\lldb-mi\\symbol\\Output\\symbol-list-lines.test.tmp",host-name="E:\\_work\\4\\b\\LLVMBuild\\tools\\lldb\\lit\\tools\\lldb-mi\\symbol\\Output\\symbol-list-lines.test.tmp",symbols-loaded="0",loaded_addr="-",size="0"
^done
(gdb)
^done
(gdb)
^done
(gdb)
^done
(gdb)
^error,msg="File Handler. Invalid file name path"
(gdb)
^done
(gdb)
^done
(gdb)
^error,msg="File Handler. Invalid file name path"
(gdb)
^done
(gdb)
^error,msg="File Handler. Invalid file name path"
(gdb)
^done
(gdb)

[stella.stamenova]

@apolyakov Perhaps we can mark the test as XFAIL on Windows while you investigate. Any objections?

[apolyakov]

In D48802#1161904, @stella.stamenova wrote:

@apolyakov Perhaps we can mark the test as XFAIL on Windows while you investigate. Any objections?

Sure, I'll do it.

[apolyakov]

@stella.stamenova Done in r337064.

[stella.stamenova]

Thank you!

[tatyana-krasnukha]

symbol-list-lines.test fails on Linux too, input is compiled with gcc.

lldb/trunk/lit/tools/lldb-mi/symbol/inputs/symbol-list-lines.c

6 ↗

(On Diff #153922)

The check doesn't count this line

lldb/trunk/lit/tools/lldb-mi/symbol/symbol-list-lines.test

14 ↗

(On Diff #153922)

here

[apolyakov]

In D48802#1234892, @tatyana-krasnukha wrote:

symbol-list-lines.test fails on Linux too, input is compiled with gcc.

Thanks for noting this. Fixed in r342329 (https://reviews.llvm.org/D52101).

lit/tools/lldb-mi/symbol/inputs/list-lines-helper.h

+void HelpFunction(void);

lit/tools/lldb-mi/symbol/inputs/list-lines-helper.c

+void HelpFunction(void) {
+  int x = 12345;
+}

lit/tools/lldb-mi/symbol/inputs/main.c

+#include "symbol-list-lines.h"
+
+int main(void) {
+  int x = GetZero();
+  return 0;
+}

lit/tools/lldb-mi/symbol/inputs/symbol-list-lines.h

+int GetZero();

lit/tools/lldb-mi/symbol/inputs/symbol-list-lines.c

+#include "list-lines-helper.h"
+
+int GetZero() {
+  HelpFunction();
+  return 0;
+}

lit/tools/lldb-mi/symbol/lit.local.cfg

+config.suffixes = ['.test']

lit/tools/lldb-mi/symbol/symbol-list-lines.test

+# RUN: %cc -o %t %p/inputs/main.c %p/inputs/symbol-list-lines.c %p/inputs/list-lines-helper.c -g
+# RUN: %lldbmi %t < %s | FileCheck %s
+
+# Test lldb-mi -symbol-list-lines command.
+
+# Check that we have a valid target created via '%lldbmi %t'.
+# CHECK: ^done
+
+-symbol-list-lines invalid_file.c
+# Check a case of invalid file name.
+# CHECK: ^error,msg="File Handler. Invalid file name path"
+
+-symbol-list-lines symbol-list-lines.c
+# CHECK: ^done,lines=[{pc="0x{{[0-9A-Fa-f]+}}",line="3"},{pc="0x{{[0-9A-Fa-f]+}}",line="4"},{pc="0x{{[0-9A-Fa-f]+}}",line="5"}]
+
+-symbol-list-lines list-lines-helper.c
+# CHECK: ^done,lines=[{pc="0x{{[0-9A-Fa-f]+}}",line="1"},{pc="0x{{[0-9A-Fa-f]+}}",line="2"},{pc="0x{{[0-9A-Fa-f]+}}",line="3"}]

packages/Python/lldbsuite/test/tools/lldb-mi/symbol/Makefile

-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp symbol_list_lines_inline_test.cpp symbol_list_lines_inline_test2.cpp
-
-include $(LEVEL)/Makefile.rules

packages/Python/lldbsuite/test/tools/lldb-mi/symbol/main.cpp

-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-extern int j;
-extern int gfunc(int i);
-extern int gfunc2(int i);
-int
-main()
-{ // FUNC_main
-    int i = gfunc(j) + gfunc2(j);
-    return i == 0;
-}

packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.h

-namespace ns
-{
-inline int
-ifunc(int i)
-{ // FUNC_ifunc
-    return i;
-}
-struct S
-{
-    int a;
-    int b;
-    S()
-        : a(3)
-        , b(4)
-    {
-    }
-    int
-    mfunc()
-    { // FUNC_mfunc
-        return a + b;
-    }
-};
-extern S s;
-}

packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.cpp

-// Skip lines so we can make sure we're not seeing any lines from
-// symbol_list_lines_inline_test.h included in -symbol-list-lines
-// symbol_list_lines_inline_test.cpp, by checking that all the lines
-// are between 30 and 39.
-// line 5
-// line 6
-// line 7
-// line 8
-// line 9
-// line 10
-// line 11
-// line 12
-// line 13
-// line 14
-// line 15
-// line 16
-// line 17
-// line 18
-// line 19
-// line 20
-// line 21
-// line 22
-// line 23
-// line 24
-// line 25
-// line 26
-// line 27
-// line 28
-// line 29
-#include "symbol_list_lines_inline_test.h"
-int
-gfunc(int i)
-{ // FUNC_gfunc
-    return ns::ifunc(i);
-}
-namespace ns
-{
-S s; // STRUCT_s
-}

packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test2.cpp

-// Skip lines so we can make sure we're not seeing any lines from
-// symbol_list_lines_inline_test.h included in -symbol-list-lines
-// symbol_list_lines_inline_test2.cpp, by checking that all the lines
-// are between 30 and 39.
-// line 5
-// line 6
-// line 7
-// line 8
-// line 9
-// line 10
-// line 11
-// line 12
-// line 13
-// line 14
-// line 15
-// line 16
-// line 17
-// line 18
-// line 19
-// line 20
-// line 21
-// line 22
-// line 23
-// line 24
-// line 25
-// line 26
-// line 27
-// line 28
-// line 29
-#include "symbol_list_lines_inline_test.h"
-int j = 2;
-int
-gfunc2(int i)
-{ // FUNC_gfunc2
-    i += ns::s.mfunc();
-    i += ns::ifunc(i);
-    return i == 0; // END_gfunc2
-}

tools/lldb-mi/MICmdCmdSymbol.h

 //                  MICmdCmd.h / .cpp
 //              For an introduction to adding a new command see
 //              CMICmdCmdSupportInfoMiCmdQuery
 //              command class as an example.
 
 #pragma once
 
 // Third party headers:
-#include "lldb/API/SBCommandReturnObject.h"
 
 // In-house headers:
 #include "MICmdBase.h"
+#include "MICmnMIValueList.h"
 
 //++
 //============================================================================
 // Details: MI command class. MI commands derived from the command base class.
 //          *this class implements MI command "symbol-list-lines".
 //--
 class CMICmdCmdSymbolListLines : public CMICmdBase {
   // Statics:
public:
   bool Execute() override;
   bool Acknowledge() override;
   bool ParseArgs() override;
   // From CMICmnBase
   /* dtor */ ~CMICmdCmdSymbolListLines() override;
 
   // Attributes:
 private:
-  lldb::SBCommandReturnObject m_lldbResult;
+  CMICmnMIValueList m_resultList;
   const CMIUtilString m_constStrArgNameFile;
 };

tools/lldb-mi/MICmdCmdSymbol.cpp

 //===-- MICmdCmdSymbol.cpp --------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // Overview:    CMICmdCmdSymbolListLines     implementation.
 
 // Third Party Headers:
-#include "lldb/API/SBCommandInterpreter.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Regex.h"
+#include "llvm/ADT/Twine.h"
 
 // In-house headers:
 #include "MICmdArgValFile.h"
 #include "MICmdCmdSymbol.h"
 #include "MICmnLLDBDebugSessionInfo.h"
 #include "MICmnMIResultRecord.h"
-#include "MICmnMIValueList.h"
 #include "MICmnMIValueTuple.h"
+#include "MICmnMIValueResult.h"
+
+namespace {
+const CMICmnMIValueTuple
+CreateMITuplePCLine(const uint32_t addr, const uint32_t line_number) {
+  const CMICmnMIValueConst miValueConstAddr("0x" + llvm::Twine::utohexstr(addr).str());
+  const CMICmnMIValueConst miValueConstLine(llvm::Twine(line_number).str());
+  const CMICmnMIValueResult miValueResultAddr("pc", miValueConstAddr);
+  const CMICmnMIValueResult miValueResultLine("line", miValueConstLine);
+  CMICmnMIValueTuple miValueTuple(miValueResultAddr);
+  miValueTuple.Add(miValueResultLine);
+  return miValueTuple;
+}
+} // namespace
 
 //++
 //------------------------------------------------------------------------------------
 // Details: CMICmdCmdSymbolListLines constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
 CMICmdCmdSymbolListLines::CMICmdCmdSymbolListLines()
-    : m_constStrArgNameFile("file") {
+    : m_resultList(false), m_constStrArgNameFile("file") {
   // Command factory matches this name with that received from the stdin stream
   m_strMiCmd = "symbol-list-lines";
 
   // Required by the CMICmdFactory when registering *this command
   m_pSelfCreatorFn = &CMICmdCmdSymbolListLines::CreateSelf;
 }
 
 //++

 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool CMICmdCmdSymbolListLines::Execute() {
   CMICMDBASE_GETOPTION(pArgFile, File, m_constStrArgNameFile);
 
-  const CMIUtilString &strFilePath(pArgFile->GetValue());
-  const CMIUtilString strCmd(CMIUtilString::Format(
-      "source info --file \"%s\"", strFilePath.AddSlashes().c_str()));
-
-  CMICmnLLDBDebugSessionInfo &rSessionInfo(
-      CMICmnLLDBDebugSessionInfo::Instance());
-  const lldb::ReturnStatus rtn =
-      rSessionInfo.GetDebugger().GetCommandInterpreter().HandleCommand(
-          strCmd.c_str(), m_lldbResult);
-  MIunused(rtn);
-
-  return MIstatus::success;
+  const auto &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
+  if (rSessionInfo.GetTarget() == rSessionInfo.GetDebugger().GetDummyTarget()) {
+    SetError(CMIUtilString::Format(MIRSRC(IDS_CMD_ERR_INVALID_TARGET_CURRENT),
+                                   m_cmdData.strMiCmd.c_str()));
+    return MIstatus::failure;
+  }
+
+  const lldb::SBFileSpec source_file_spec(pArgFile->GetValue().c_str(), true);
+  const char *source_file_name = source_file_spec.GetFilename();
+  const char *source_file_directory = source_file_spec.GetDirectory();
+  const bool has_path = source_file_directory;
+
+  lldb::SBSymbolContextList sc_cu_list =
+      CMICmnLLDBDebugSessionInfo::Instance().GetTarget().FindCompileUnits(
+          source_file_spec);
+
+  bool found_something = false;
+  for (uint32_t i = 0, e = sc_cu_list.GetSize(); i < e; ++i) {
+    const lldb::SBCompileUnit cu =
+        sc_cu_list.GetContextAtIndex(i).GetCompileUnit();
+    for (uint32_t j = 0, e = cu.GetNumLineEntries(); j < e; ++j) {
+      const lldb::SBLineEntry line = cu.GetLineEntryAtIndex(j);
+      const lldb::SBFileSpec line_spec = line.GetFileSpec();
+      if (line_spec.GetFilename() == source_file_name) {
+        if (has_path && (line_spec.GetDirectory() != source_file_directory))
+          continue;
+        // We don't need a line with start address equals to end one,
+        // so just skip it.
+        const lldb::SBAddress line_start_address = line.GetStartAddress();
+        const lldb::SBAddress line_end_address = line.GetEndAddress();
+        if (line_start_address == line_end_address)
+          continue;
+        // We have a matching line.
+        found_something = true;
+        m_resultList.Add(CreateMITuplePCLine(
+            line_start_address.GetFileAddress(),
+            line.GetLine()));
       }
-
-//++
-//------------------------------------------------------------------------------------
-// Details: Helper function for parsing the header returned from lldb for the
-// command:
-//              target modules dump line-table <file>
-//          where the header is of the format:
-//              Line table for /path/to/file in `/path/to/module
-// Args:    input - (R) Input string to parse.
-//          file  - (W) String representing the file.
-// Return:  bool - True = input was parsed successfully, false = input could not
-// be parsed.
-// Throws:  None.
-//--
-static bool ParseLLDBLineAddressHeader(const char *input, CMIUtilString &file) {
-  // Match LineEntry using regex.
-  static llvm::Regex g_lineentry_header_regex(llvm::StringRef(
-      "^ *Lines found for file (.+) in compilation unit (.+) in `(.+)$"));
-  //                                       ^1=file                  ^2=cu
-  //                                       ^3=module
-
-  llvm::SmallVector<llvm::StringRef, 4> match;
-
-  const bool ok = g_lineentry_header_regex.match(input, &match);
-  if (ok)
-    file = match[1];
-  return ok;
     }
-
-//++
-//------------------------------------------------------------------------------------
-// Details: Helper function for parsing a line entry returned from lldb for the
-// command:
-//              target modules dump line-table <file>
-//          where the line entry is of the format:
-//              0x0000000100000e70: /path/to/file:3002[:4]
-//              addr                file          line column(opt)
-// Args:    input - (R) Input string to parse.
-//          addr  - (W) String representing the pc address.
-//          file  - (W) String representing the file.
-//          line  - (W) String representing the line.
-// Return:  bool - True = input was parsed successfully, false = input could not
-// be parsed.
-// Throws:  None.
-//--
-static bool ParseLLDBLineAddressEntry(const char *input, CMIUtilString &addr,
-                                      CMIUtilString &file,
-                                      CMIUtilString &line) {
-  // Note: Ambiguities arise because the column is optional, and
-  // because : can appear in filenames or as a byte in a multibyte
-  // UTF8 character.  We keep those cases to a minimum by using regex
-  // to work on the string from both the left and right, so that what
-  // is remains is assumed to be the filename.
-
-  // Match LineEntry using regex.
-  static llvm::Regex g_lineentry_nocol_regex(llvm::StringRef(
-      "^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$"));
-  static llvm::Regex g_lineentry_col_regex(llvm::StringRef(
-      "^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$"));
-  //                     ^1=start         ^2=end               ^3=f ^4=line
-  //                     ^5=:col(opt)
-
-  llvm::SmallVector<llvm::StringRef, 6> match;
-
-  // First try matching the LineEntry with the column,
-  // then try without the column.
-  const bool ok = g_lineentry_col_regex.match(input, &match) ||
-                  g_lineentry_nocol_regex.match(input, &match);
-  if (ok) {
-    addr = match[1];
-    file = match[3];
-    line = match[4];
   }
-  return ok;
+  if (!found_something) {
+    SetError(MIRSRC(IDS_UTIL_FILE_ERR_INVALID_PATHNAME));
+    return MIstatus::failure;
+  }
+  return MIstatus::success;
 }
 
 //++
 //------------------------------------------------------------------------------------
 // Details: The invoker requires this function. The command prepares a MI Record
 // Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.
 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
 bool CMICmdCmdSymbolListLines::Acknowledge() {
-  if (m_lldbResult.GetErrorSize() > 0) {
-    const char *pLldbErr = m_lldbResult.GetError();
-    const CMIUtilString strMsg(CMIUtilString(pLldbErr).StripCRAll());
-    const CMICmnMIValueConst miValueConst(strMsg);
-    const CMICmnMIValueResult miValueResult("message", miValueConst);
-    const CMICmnMIResultRecord miRecordResult(
-        m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error,
-        miValueResult);
-    m_miResultRecord = miRecordResult;
-  } else {
-    CMIUtilString::VecString_t vecLines;
-    const CMIUtilString strLldbMsg(m_lldbResult.GetOutput());
-    const MIuint nLines(strLldbMsg.SplitLines(vecLines));
-
-    // Parse the file from the header.
-    const CMIUtilString &rWantFile(vecLines[0]);
-    CMIUtilString strWantFile;
-    if (!ParseLLDBLineAddressHeader(rWantFile.c_str(), strWantFile)) {
-      // Unexpected error - parsing failed.
-      // MI print "%s^error,msg=\"Command '-symbol-list-lines'. Error: Line
-      // address header is absent or has an unknown format.\""
-      const CMICmnMIValueConst miValueConst(CMIUtilString::Format(
-          MIRSRC(IDS_CMD_ERR_SOME_ERROR), m_cmdData.strMiCmd.c_str(),
-          "Line address header is absent or has an unknown format."));
-      const CMICmnMIValueResult miValueResult("msg", miValueConst);
-      const CMICmnMIResultRecord miRecordResult(
-          m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error,
-          miValueResult);
-      m_miResultRecord = miRecordResult;
-
-      return MIstatus::success;
-    }
-
-    // Parse the line address entries.
-    CMICmnMIValueList miValueList(true);
-    for (MIuint i = 1; i < nLines; ++i) {
-      // String looks like:
-      // 0x0000000100000e70: /path/to/file:3[:4]
-      const CMIUtilString &rLine(vecLines[i]);
-      CMIUtilString strAddr;
-      CMIUtilString strFile;
-      CMIUtilString strLine;
-
-      if (!ParseLLDBLineAddressEntry(rLine.c_str(), strAddr, strFile, strLine))
-        continue;
-
-      const CMICmnMIValueConst miValueConst(strAddr);
-      const CMICmnMIValueResult miValueResult("pc", miValueConst);
-      CMICmnMIValueTuple miValueTuple(miValueResult);
-
-      const CMICmnMIValueConst miValueConst2(strLine);
-      const CMICmnMIValueResult miValueResult2("line", miValueConst2);
-      miValueTuple.Add(miValueResult2);
-
-      miValueList.Add(miValueTuple);
-    }
-
-    // MI print "%s^done,lines=[{pc=\"%d\",line=\"%d\"}...]"
-    const CMICmnMIValueResult miValueResult("lines", miValueList);
-    const CMICmnMIResultRecord miRecordResult(
-        m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done,
-        miValueResult);
-    m_miResultRecord = miRecordResult;
-  }
-
+  const CMICmnMIValueResult miValueResult("lines", m_resultList);
+  m_miResultRecord = CMICmnMIResultRecord(
   return MIstatus::success;
 }
 
 //++
 //------------------------------------------------------------------------------------
 // Details: Required by the CMICmdFactory when registering *this command. The
 // factory
 //          calls this function to create an instance of *this command.
 // Type:    Static method.
 // Args:    None.
 // Return:  CMICmdBase * - Pointer to a new command.
 // Throws:  None.
 //--
 CMICmdBase *CMICmdCmdSymbolListLines::CreateSelf() {
   return new CMICmdCmdSymbolListLines();
 }