Bug 967215 - Fix fix_macosx_stack.py. r=njn DONTBUILD

dothq · Feb 6, 2014 · a206685 · a206685
1 parent 39001bc
commit a206685
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tools/rb/fix_macosx_stack.py b/tools/rb/fix_macosx_stack.py
@@ -81,7 +81,7 @@ def addressToSymbol(file, address):
     converter = None
     if not file in atoses:
         debug_file = separate_debug_file_for(file) or file
-        converter = unbufferedLineConverter('/usr/bin/atos', ['-arch', 'x86_64', '-o', debug_file])
+        converter = unbufferedLineConverter('/usr/bin/xcrun', ['atos', '-arch', 'x86_64', '-o', debug_file])
         atoses[file] = converter
     else:
         converter = atoses[file]
@@ -99,7 +99,7 @@ def cxxfilt(sym):
     cxxfilt_proc.stdin.write(sym + "\n")
     return cxxfilt_proc.stdout.readline().rstrip("\n")
 
-line_re = re.compile("^(.*) ?\[([^ ]*) \+(0x[0-9A-F]{1,8})\](.*)$")
+line_re = re.compile("^(.*) ?\[([^ ]*) \+(0x[0-9a-fA-F]{1,8})\](.*)$")
 balance_tree_re = re.compile("^([ \|0-9-]*)")
 atos_name_re = re.compile("^(.+) \(in ([^)]+)\) \((.+)\)$")