For the purposes of setting breakpoints treat methods defined in the class and methods defined in a category on the class as the same.

llvm-svn: 131331

1 files changed, 18 insertions, 0 deletions

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
index e2c92a6ba70..8e883d15eb2 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
@@ -809,6 +809,24 @@ DWARFCompileUnit::Index
                                 // accelerator tables
                                 size_t method_name_len = name_len - (method_name - name) - 1;                                
                                 func_selectors.Insert (ConstString (method_name, method_name_len), die_info);
+                                
+                                // Also see if this is a "category" on our class.  If so strip off the category name,
+                                // and add the class name without it to the basename table. 
+                                
+                                const char *first_paren = strnstr (name, "(", method_name - name);
+                                if (first_paren)
+                                {
+                                    const char *second_paren = strnstr (first_paren, ")", method_name - first_paren);
+                                    if (second_paren)
+                                    {
+                                        std::string buffer (name, first_paren - name);
+                                        buffer.append (second_paren + 1);
+                                        ConstString uncategoried_name (buffer.c_str());
+                                        func_basenames.Insert (uncategoried_name, die_info);
+                                        func_fullnames.Insert (uncategoried_name, die_info);
+
+                                    }
+                                }
                             }
                         }
                     }