diff options
| author | emaste <emaste@FreeBSD.org> | 2015-07-03 16:57:06 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-07-03 16:57:06 +0000 |
| commit | 8037fa4ee916fa20b3c63cbf531f4ee7e1c76138 (patch) | |
| tree | 3c2e41c3be19b7fc7666ed45a5f91ec3b6e35f2a /source/Commands/CommandObjectSource.cpp | |
| parent | d61b076ede88b56f3372a55e7d1eac6a9d717120 (diff) | |
| download | FreeBSD-src-8037fa4ee916fa20b3c63cbf531f4ee7e1c76138.zip FreeBSD-src-8037fa4ee916fa20b3c63cbf531f4ee7e1c76138.tar.gz | |
Import LLDB as of upstream SVN 241361 (git 612c075f)
Diffstat (limited to 'source/Commands/CommandObjectSource.cpp')
| -rw-r--r-- | source/Commands/CommandObjectSource.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/Commands/CommandObjectSource.cpp b/source/Commands/CommandObjectSource.cpp index a88a9b1..7c5f127 100644 --- a/source/Commands/CommandObjectSource.cpp +++ b/source/Commands/CommandObjectSource.cpp @@ -7,8 +7,6 @@ // //===----------------------------------------------------------------------===// -#include "lldb/lldb-python.h" - #include "CommandObjectSource.h" // C Includes @@ -253,7 +251,7 @@ public: "source list", "Display source code (as specified) based on the current executable's debug info.", NULL, - eFlagRequiresTarget), + eCommandRequiresTarget), m_options (interpreter) { } @@ -539,9 +537,9 @@ protected: { SymbolContext sc; sc_list_symbols.GetContextAtIndex (i, sc); - if (sc.symbol) + if (sc.symbol && sc.symbol->ValueIsAddress()) { - const Address &base_address = sc.symbol->GetAddress(); + const Address &base_address = sc.symbol->GetAddressRef(); Function *function = base_address.CalculateSymbolContextFunction(); if (function) { @@ -690,13 +688,15 @@ protected: bool show_module = true; bool show_inlined_frames = true; const bool show_function_arguments = true; + const bool show_function_name = true; sc.DumpStopContext(&result.GetOutputStream(), m_exe_ctx.GetBestExecutionContextScope(), sc.line_entry.range.GetBaseAddress(), show_fullpaths, show_module, show_inlined_frames, - show_function_arguments); + show_function_arguments, + show_function_name); result.GetOutputStream().EOL(); if (m_options.num_lines == 0) |
