Fixed a crasher (an assert was firing in the DWARF parser) when setting

breakpoints on inlined functions by name. This involved fixing the DWARF parser
to correctly back up and parse the concrete function when we find inlined
functions by name, then grabbing any appropriate inlined blocks and returning
symbol contexts with the block filled in. After this was fixed, the breakpoint
by name resolver needed to correctly deal with symbol contexts that had the
inlined block filled in in the symbol contexts.



git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@119017 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 31 insertions, 7 deletions

diff --git a/source/Breakpoint/BreakpointResolverName.cpp b/source/Breakpoint/BreakpointResolverName.cpp
index f358fb3c1..0914e12ee 100644
--- a/source/Breakpoint/BreakpointResolverName.cpp
+++ b/source/Breakpoint/BreakpointResolverName.cpp
@@ -191,8 +191,21 @@ BreakpointResolverName::SearchCallback
                     remove = true;
                 else if (sc.function == NULL)
                     remove = true;
-                else if (::strstr (sc.function->GetName().AsCString(), basename_filter) == NULL)
-                    remove = true;
+                else
+                {
+                    const InlineFunctionInfo* inlined_info = NULL;
+                    
+                    if (sc.block)
+                        inlined_info = sc.block->GetInlinedFunctionInfo();
+
+                    if (inlined_info)
+                    {
+                        if (::strstr (inlined_info->GetName().AsCString(), basename_filter) == NULL)
+                            remove = true;
+                    }
+                    else if (::strstr (sc.function->GetName().AsCString(), basename_filter) == NULL)
+                        remove = true;
+                }
 
                 if (remove)
                 {
@@ -259,16 +272,27 @@ BreakpointResolverName::SearchCallback
         {
             if (func_list.GetContextAtIndex(i, sc))
             {
-                if (sc.function)
+                if (sc.block && sc.block->GetInlinedFunctionInfo())
+                {
+                    if (!sc.block->GetStartAddress(break_addr))
+                        break_addr.Clear();
+                }
+                else if (sc.function)
                 {
                     break_addr = sc.function->GetAddressRange().GetBaseAddress();
                     if (skip_prologue)
                     {
-                        const uint32_t prologue_byte_size = sc.function->GetPrologueByteSize();
-                        if (prologue_byte_size)
-                            break_addr.SetOffset(break_addr.GetOffset() + prologue_byte_size);
+                        if (break_addr.IsValid())
+                        {
+                            const uint32_t prologue_byte_size = sc.function->GetPrologueByteSize();
+                            if (prologue_byte_size)
+                                break_addr.SetOffset(break_addr.GetOffset() + prologue_byte_size);
+                        }
                     }
-                    
+                }
+                
+                if (break_addr.IsValid())
+                {
                     if (filter.AddressPasses(break_addr))
                     {
                         BreakpointLocationSP bp_loc_sp (m_breakpoint->AddLocation(break_addr, &new_location));