diff options
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp')
-rw-r--r-- | contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp index a6d65e4..aba8922 100644 --- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp +++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp @@ -13,8 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes - -#include "lldb/lldb-private-log.h" #include "lldb/Core/Log.h" #include "lldb/Core/Stream.h" #include "lldb/Symbol/Block.h" @@ -248,7 +246,7 @@ ThreadPlanStepOverRange::ShouldStop (Event *event_ptr) && sc.comp_unit == m_addr_context.comp_unit && sc.function == m_addr_context.function) { - // Okay, find the next occurance of this file in the line table: + // Okay, find the next occurrence of this file in the line table: LineTable *line_table = m_addr_context.comp_unit->GetLineTable(); if (line_table) { @@ -261,7 +259,7 @@ ThreadPlanStepOverRange::ShouldStop (Event *event_ptr) bool step_past_remaining_inline = false; if (entry_idx > 0) { - // We require the the previous line entry and the current line entry come + // We require the previous line entry and the current line entry come // from the same file. // The other requirement is that the previous line table entry be part of an // inlined block, we don't want to step past cases where people have inlined @@ -432,7 +430,7 @@ ThreadPlanStepOverRange::DoWillResume (lldb::StateType resume_state, bool curren const InlineFunctionInfo *inline_info = frame_block->GetInlinedFunctionInfo(); const char *name; if (inline_info) - name = inline_info->GetName().AsCString(); + name = inline_info->GetName(frame_block->CalculateSymbolContextFunction()->GetLanguage()).AsCString(); else name = "<unknown-notinlined>"; |