From d3441c2c96346611abd752270144d5f71d4f68b3 Mon Sep 17 00:00:00 2001 From: "ted.mielczarek" Date: Mon, 8 Dec 2008 13:00:29 +0000 Subject: Issue 284 - DWARF dumper doesn't output function names including arguments. r=nealsid git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@302 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/mac/dump_syms.mm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/common/mac/dump_syms.mm') diff --git a/src/common/mac/dump_syms.mm b/src/common/mac/dump_syms.mm index 901f6276..88f1f4f1 100644 --- a/src/common/mac/dump_syms.mm +++ b/src/common/mac/dump_syms.mm @@ -63,7 +63,6 @@ static NSString *kHeaderSizeKey = @"size"; static NSString *kHeaderOffsetKey = @"offset"; // Offset to the header static NSString *kHeaderIs64BitKey = @"is64"; static NSString *kHeaderCPUTypeKey = @"cpuType"; -static NSString *kUnknownSymbol = @"???"; // The section for __TEXT, __text seems to be always 1. This is useful // for pruning out extraneous non-function symbols. @@ -433,6 +432,15 @@ void DumpFunctionMap(const dwarf2reader::FunctionMap function_map) { NSString *symbolName = [NSString stringWithUTF8String:iter->second->name.c_str()]; [dict setObject:symbolName forKey:kAddressSymbolKey]; } + + // try demangling function name if we have a mangled name + if (![dict objectForKey:kAddressConvertedSymbolKey] && + !iter->second->mangled_name.empty()) { + NSString *mangled = [NSString stringWithUTF8String:iter->second->mangled_name.c_str()]; + NSString *demangled = [self convertCPlusPlusSymbol:mangled]; + if (demangled != nil) + [dict setObject:demangled forKey:kAddressConvertedSymbolKey]; + } // set line number for beginning of function if (iter->second->line && ![dict objectForKey:kAddressSourceLineKey]) -- cgit v1.2.1