From 59f600f2f63fd2d2434e4fd71233aa19384fa69f Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavel@labath.sk>
Date: Thu, 10 Jan 2019 10:23:27 +0000
Subject: Revert "Add a verbose mode to "image dump line-table" and use it to
 write a .debug_line test"

This reverts commit r350802 because the test fails on windows. This
happens because we treat the paths as windows paths even though they
have linux path separators in the asm file. That results in wrong paths
being computed (\tmp\tmp\a.c instead of /tmp/a.c).

Reverting until I can figure out what to do with this.

llvm-svn: 350810
---
 lldb/source/Commands/CommandObjectTarget.cpp | 48 +++-------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

(limited to 'lldb/source/Commands/CommandObjectTarget.cpp')

diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index 8842031b6d5..4a4d0d2d609 100644
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -1348,7 +1348,7 @@ static void DumpModuleUUID(Stream &strm, Module *module) {
 static uint32_t DumpCompileUnitLineTable(CommandInterpreter &interpreter,
                                          Stream &strm, Module *module,
                                          const FileSpec &file_spec,
-                                         lldb::DescriptionLevel desc_level) {
+                                         bool load_addresses) {
   uint32_t num_matches = 0;
   if (module) {
     SymbolContextList sc_list;
@@ -1367,7 +1367,7 @@ static uint32_t DumpCompileUnitLineTable(CommandInterpreter &interpreter,
         if (line_table)
           line_table->GetDescription(
               &strm, interpreter.GetExecutionContext().GetTargetPtr(),
-              desc_level);
+              lldb::eDescriptionLevelBrief);
         else
           strm << "No line table";
       }
@@ -2411,8 +2411,6 @@ public:
 
   ~CommandObjectTargetModulesDumpLineTable() override = default;
 
-  Options *GetOptions() override { return &m_options; }
-
 protected:
   bool DoExecute(Args &command, CommandReturnObject &result) override {
     Target *target = m_exe_ctx.GetTargetPtr();
@@ -2445,9 +2443,8 @@ protected:
             if (DumpCompileUnitLineTable(
                     m_interpreter, result.GetOutputStream(),
                     target_modules.GetModulePointerAtIndexUnlocked(i),
-                    file_spec,
-                    m_options.m_verbose ? eDescriptionLevelFull
-                                        : eDescriptionLevelBrief))
+                    file_spec, m_exe_ctx.GetProcessPtr() &&
+                                   m_exe_ctx.GetProcessRef().IsAlive()))
               num_dumped++;
           }
           if (num_dumped == 0)
@@ -2467,43 +2464,6 @@ protected:
     }
     return result.Succeeded();
   }
-
-  class CommandOptions : public Options {
-  public:
-    CommandOptions() : Options() { OptionParsingStarting(nullptr); }
-
-    Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg,
-                          ExecutionContext *execution_context) override {
-      assert(option_idx == 0 && "We only have one option.");
-      m_verbose = true;
-
-      return Status();
-    }
-
-    void OptionParsingStarting(ExecutionContext *execution_context) override {
-      m_verbose = false;
-    }
-
-    llvm::ArrayRef<OptionDefinition> GetDefinitions() override {
-      static constexpr OptionDefinition g_options[] = {
-          {LLDB_OPT_SET_ALL,
-           false,
-           "verbose",
-           'v',
-           OptionParser::eNoArgument,
-           nullptr,
-           {},
-           0,
-           eArgTypeNone,
-           "Enable verbose dump."},
-      };
-      return llvm::makeArrayRef(g_options);
-    }
-
-    bool m_verbose;
-  };
-
-  CommandOptions m_options;
 };
 
 #pragma mark CommandObjectTargetModulesDump
-- 
cgit v1.2.3