mkgist-created gist

text.txt

diff --git a/tools/rb/fix_stack_using_bpsyms.py b/tools/rb/fix_stack_using_bpsyms.py
--- a/tools/rb/fix_stack_using_bpsyms.py
+++ b/tools/rb/fix_stack_using_bpsyms.py
@@ -180,21 +180,24 @@ def addressToSymbol(file, address, symbo
     p = getSymbolFile(file, symbolsDir)
     if p:
         return p.addrToSymbol(address)
     else:
         return ""
 
 
 # Matches lines produced by NS_FormatCodeAddress().
-line_re = re.compile("^(.*#\d+: )(.+)\[(.+) \+(0x[0-9A-Fa-f]+)\](.*)$")
+line_re1 = re.compile("^(.*#\d+: )(.+)\[(.+) \+(0x[0-9A-Fa-f]+)\](.*)$")
+line_re2 = re.compile(r'^(.*#\d+: )(.*\\)?([^\\]+) \+ (0x[0-9A-Fa-f]+)(.*)$')
 
 
 def fixSymbols(line, symbolsDir, jsonEscape=False):
-    result = line_re.match(line)
+    result = line_re1.match(line)
+    if not result:
+        result = line_re2.match(line)
     if result is not None:
         (before, fn, file, address, after) = result.groups()
         address = int(address, 16)
         symbol = addressToSymbol(file, address, symbolsDir)
         if not symbol:
             symbol = "%s + 0x%x" % (os.path.basename(file), address)
         if jsonEscape:
             symbol = json.dumps(symbol)[1:-1]   # [1:-1] strips the quotes