summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/source/Symbol/SymbolContext.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/lldb/source/Symbol/SymbolContext.cpp b/lldb/source/Symbol/SymbolContext.cpp
index 80ffd342379..1df284b0b15 100644
--- a/lldb/source/Symbol/SymbolContext.cpp
+++ b/lldb/source/Symbol/SymbolContext.cpp
@@ -582,9 +582,14 @@ SymbolContext::GetFunctionName (Mangled::NamePreference preference)
{
if (block)
{
- const InlineFunctionInfo *inline_info = block->GetInlinedFunctionInfo();
- if (inline_info)
- return inline_info->GetName();
+ Block *inlined_block = block->GetContainingInlinedBlock();
+
+ if (inlined_block)
+ {
+ const InlineFunctionInfo *inline_info = inlined_block->GetInlinedFunctionInfo();
+ if (inline_info)
+ return inline_info->GetName();
+ }
}
return function->GetMangled().GetName(preference);
}
OpenPOWER on IntegriCloud