Fix a bug where LLDB would crash if 'apropos <anything>' was used after spawning...

llvm-svn: 266911

diff --git a/lldb/include/lldb/Interpreter/CommandObject.h b/lldb/include/lldb/Interpreter/CommandObject.h
index c6c0b67..aeb405f 100644 (file)
--- a/lldb/include/lldb/Interpreter/CommandObject.h
+++ b/lldb/include/lldb/Interpreter/CommandObject.h
@@ -172,6 +172,9 @@ public:
     virtual bool
     IsMultiwordObject () { return false; }
     
+    virtual CommandObjectMultiword*
+    GetAsMultiwordCommand () { return nullptr; }
+
     virtual bool
     IsAlias () { return false; }
     

diff --git a/lldb/include/lldb/Interpreter/CommandObjectMultiword.h b/lldb/include/lldb/Interpreter/CommandObjectMultiword.h
index 2196b19..3b7d186 100644 (file)
--- a/lldb/include/lldb/Interpreter/CommandObjectMultiword.h
+++ b/lldb/include/lldb/Interpreter/CommandObjectMultiword.h
@@ -41,6 +41,12 @@ public:
     {
         return true;
     }
+    
+    CommandObjectMultiword*
+    GetAsMultiwordCommand () override
+    {
+        return this;
+    }
 
     bool
     LoadSubCommand(const char *cmd_name,
@@ -131,6 +137,9 @@ public:
     bool
     IsMultiwordObject() override;
     
+    CommandObjectMultiword*
+    GetAsMultiwordCommand () override;
+    
     void
     GenerateHelpText (Stream &result) override;
     

diff --git a/lldb/include/lldb/lldb-forward.h b/lldb/include/lldb/lldb-forward.h
index 4be1735..e9137b3 100644 (file)
--- a/lldb/include/lldb/lldb-forward.h
+++ b/lldb/include/lldb/lldb-forward.h
@@ -59,6 +59,7 @@ class   ClangPersistentVariables;
 class   CommandInterpreter;
 class   CommandInterpreterRunOptions;
 class   CommandObject;
+class   CommandObjectMultiword;
 class   CommandReturnObject;
 class   Communication;
 class   CompactUnwindInfo;

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile
new file mode 100644 (file)
index 0000000..8a7102e
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py b/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
new file mode 100644 (file)
index 0000000..66ed3ff
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
@@ -0,0 +1,44 @@
+"""
+Test that apropos env doesn't crash trying to touch the process plugin commmand
+"""
+
+from __future__ import print_function
+
+
+
+import os, time
+import re
+import lldb
+from lldbsuite.test.lldbtest import *
+import lldbsuite.test.lldbutil as lldbutil
+
+class AproposWithProcessTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        # Find the line number to break inside main().
+        self.line = line_number('main.cpp', '// break here')
+
+    def test_apropos_with_process(self):
+        """Test that apropos env doesn't crash trying to touch the process plugin commmand."""
+        self.build()
+        exe = os.path.join(os.getcwd(), "a.out")
+        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
+
+        # Break in main() aftre the variables are assigned values.
+        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+
+        self.runCmd("run", RUN_SUCCEEDED)
+
+        # The stop reason of the thread should be breakpoint.
+        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+            substrs = ['stopped', 'stop reason = breakpoint'])
+
+        # The breakpoint should have a hit count of 1.
+        self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
+            substrs = [' resolved, hit count = 1'])
+
+        self.runCmd('apropos env')

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp
new file mode 100644 (file)
index 0000000..44c1496
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp
@@ -0,0 +1,15 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include <stdio.h>
+
+int main (int argc, char const *argv[])
+{
+  return 0; // break here
+}
+

diff --git a/lldb/source/Commands/CommandObjectMultiword.cpp b/lldb/source/Commands/CommandObjectMultiword.cpp
index 887ce24..ae19976 100644 (file)
--- a/lldb/source/Commands/CommandObjectMultiword.cpp
+++ b/lldb/source/Commands/CommandObjectMultiword.cpp
@@ -367,6 +367,15 @@ CommandObjectProxy::IsMultiwordObject ()
     return false;
 }
 
+CommandObjectMultiword*
+CommandObjectProxy::GetAsMultiwordCommand ()
+{
+    CommandObject *proxy_command = GetProxyCommandObject();
+    if (proxy_command)
+        return proxy_command->GetAsMultiwordCommand();
+    return nullptr;
+}
+
 void
 CommandObjectProxy::GenerateHelpText (Stream &result)
 {

diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index 064a95f..b28c44a 100644 (file)
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -2806,7 +2806,7 @@ CommandInterpreter::FindCommandsForApropos (const char *search_word,
         
         if (cmd_obj->IsMultiwordObject())
         {
-            CommandObjectMultiword *cmd_multiword = (CommandObjectMultiword*)cmd_obj;
+            CommandObjectMultiword *cmd_multiword = cmd_obj->GetAsMultiwordCommand();
             FindCommandsForApropos(search_word,
                                    commands_found,
                                    commands_help,