Bug 967215 - Fix fix_macosx_stack.py. r=njn DONTBUILD
authorAndrew McCreight <continuation@gmail.com>
Thu, 06 Feb 2014 11:31:49 -0800
changeset 167358 cff3bc2d153888cbaa095ef372ff53283ae58230
parent 167357 8b74966f80daccafc7086779524bdf9f6e4ccd7e
child 167359 6cc6bec9eeb3dc9d13c4cfd5f8de247c60754b66
push id26168
push usercbook@mozilla.com
push dateFri, 07 Feb 2014 08:51:05 +0000
treeherdermozilla-central@1ca0ce406aad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs967215
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 967215 - Fix fix_macosx_stack.py. r=njn DONTBUILD
tools/rb/fix_macosx_stack.py
--- a/tools/rb/fix_macosx_stack.py
+++ b/tools/rb/fix_macosx_stack.py
@@ -76,17 +76,17 @@ def address_adjustment(file):
 
     return address_adjustments[file]
 
 atoses = {}
 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]
     return converter.convert("0x%X" % address)
 
 cxxfilt_proc = None
 def cxxfilt(sym):
     if cxxfilt_proc is None:
@@ -94,17 +94,17 @@ def cxxfilt(sym):
         globals()["cxxfilt_proc"] = subprocess.Popen(['c++filt',
                                                       '--no-strip-underscores',
                                                       '--format', 'gnu-v3'],
                                                      stdin=subprocess.PIPE,
                                                      stdout=subprocess.PIPE)
     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 ([^)]+)\) \((.+)\)$")
 
 def fixSymbols(line):
     result = line_re.match(line)
     if result is not None:
         # before allows preservation of balance trees
         # after allows preservation of counts