Author: enrico
Date: Wed Apr 20 15:48:05 2016
New Revision: 266911
URL: http://llvm.org/viewvc/llvm-project?rev=266911&view=rev
Log:
Fix a bug where LLDB would crash if 'apropos <anything>' was used after
spawning an inferior process
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp
Modified:
lldb/trunk/include/lldb/Interpreter/CommandObject.h
lldb/trunk/include/lldb/Interpreter/CommandObjectMultiword.h
lldb/trunk/include/lldb/lldb-forward.h
lldb/trunk/source/Commands/CommandObjectMultiword.cpp
lldb/trunk/source/Interpreter/CommandInterpreter.cpp
Modified: lldb/trunk/include/lldb/Interpreter/CommandObject.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandObject.h?rev=266911&r1=266910&r2=266911&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandObject.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandObject.h Wed Apr 20 15:48:05 2016
@@ -172,6 +172,9 @@ public:
virtual bool
IsMultiwordObject () { return false; }
+ virtual CommandObjectMultiword*
+ GetAsMultiwordCommand () { return nullptr; }
+
virtual bool
IsAlias () { return false; }
Modified: lldb/trunk/include/lldb/Interpreter/CommandObjectMultiword.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandObjectMultiword.h?rev=266911&r1=266910&r2=266911&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandObjectMultiword.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandObjectMultiword.h Wed Apr 20
15:48:05 2016
@@ -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;
Modified: lldb/trunk/include/lldb/lldb-forward.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward.h?rev=266911&r1=266910&r2=266911&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-forward.h (original)
+++ lldb/trunk/include/lldb/lldb-forward.h Wed Apr 20 15:48:05 2016
@@ -59,6 +59,7 @@ class ClangPersistentVariables;
class CommandInterpreter;
class CommandInterpreterRunOptions;
class CommandObject;
+class CommandObjectMultiword;
class CommandReturnObject;
class Communication;
class CompactUnwindInfo;
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile?rev=266911&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile
Wed Apr 20 15:48:05 2016
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py?rev=266911&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
Wed Apr 20 15:48:05 2016
@@ -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')
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp?rev=266911&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp
Wed Apr 20 15:48:05 2016
@@ -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
+}
+
Modified: lldb/trunk/source/Commands/CommandObjectMultiword.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMultiword.cpp?rev=266911&r1=266910&r2=266911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMultiword.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMultiword.cpp Wed Apr 20 15:48:05
2016
@@ -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)
{
Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=266911&r1=266910&r2=266911&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Wed Apr 20 15:48:05
2016
@@ -2806,7 +2806,7 @@ CommandInterpreter::FindCommandsForAprop
if (cmd_obj->IsMultiwordObject())
{
- CommandObjectMultiword *cmd_multiword =
(CommandObjectMultiword*)cmd_obj;
+ CommandObjectMultiword *cmd_multiword =
cmd_obj->GetAsMultiwordCommand();
FindCommandsForApropos(search_word,
commands_found,
commands_help,
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
