Update the upstream version of asan_symbolize.py to r222535,

tools/valgrind/asan/asan_symbolize.py

Index: tools/valgrind/asan/asan_symbolize.py
diff --git a/tools/valgrind/asan/asan_symbolize.py b/tools/valgrind/asan/asan_symbolize.py
index ba8d69859fdb290451c6d1d1f931520004e1f316..774f1b8f41ade2e07063141d9e3e254fa348b8d0 100755
--- a/tools/valgrind/asan/asan_symbolize.py
+++ b/tools/valgrind/asan/asan_symbolize.py
@@ -45,13 +45,57 @@ def set_symbolizer_path():
     os.environ['LLVM_SYMBOLIZER_PATH'] = os.path.abspath(symbolizer_path)
 
 
+# Construct a path to the .dSYM bundle for the given binary.
+# There are three possible cases for binary location in Chromium:
+# 1. The binary is a standalone executable or dynamic library in the product
+#    dir, the debug info is in "binary.dSYM" in the product dir.
+# 2. The binary is a standalone framework or .app bundle, the debug info is in
+#    "Framework.framework.dSYM" or "App.app.dSYM" in the product dir.
+# 3. The binary is a framework or an .app bundle within another .app bundle
+#    (e.g. Outer.app/Contents/Versions/1.2.3.4/Inner.app), and the debug info
+#    is in Inner.app.dSYM in the product dir.
+# The first case is handled by llvm-symbolizer, so we only need to construct
+# .dSYM paths for .app bundles and frameworks.
+def chrome_dsym_hints(binary):
+  path_parts = binary.split(os.path.sep)
+  app_positions = []
+  framework_positions = []
+  for index, part in enumerate(path_parts):
+    if part.endswith('.app'):
+      app_positions.append(index)
+    elif part.endswith('.framework'):
+      framework_positions.append(index)
+  assert len(framework_positions) < 2, \

[earthdok, 2014/12/16 17:43:43]

<=1 for consistency

[Alexander Potapenko, 2014/12/16 17:52:07]

Done.

+      "The path contains more than one framework: %s" % binary
+  bundles = app_positions + framework_positions

[earthdok, 2014/12/16 17:43:43]

I think this should be named bundle_positions.

[Alexander Potapenko, 2014/12/16 17:52:07]

Done.

+  bundles.sort()
+  assert len(bundles) <= 2, \
+      "The path contains more than two nested bundles: %s" % binary
+  if len(bundles) == 0:
+    # Case 1: this is a standalone executable or dylib.
+    return []
+  assert (len(bundles) == 1 or

[earthdok, 2014/12/16 17:43:43]

Please add those assertions to the comment above.

[Alexander Potapenko, 2014/12/16 17:52:07]

Done.

+          len(app_positions) == 2 or
+          app_positions[0] < framework_positions[0]), \
+      "The path contains an app bundle inside a framework: %s" % binary
+  # Cases 2 and 3. The outermost bundle (which is the only bundle in the case 2)
+  # is located in the product dir.
+  outermost_bundle = bundles[0]
+  product_dir = path_parts[:outermost_bundle]
+  # In case 2 this is the same as |outermost_bundle|.
+  innermost_bundle = bundles[-1]
+  dsym_path = product_dir + [path_parts[innermost_bundle]]
+  result = '%s.dSYM' % os.path.sep.join(dsym_path)
+  return [result]
+
+
 def main():
   disable_buffering()
   set_symbolizer_path()
   asan_symbolize.demangle = True
   asan_symbolize.fix_filename_patterns = sys.argv[1:]
   asan_symbolize.logfile = sys.stdin
-  loop = asan_symbolize.SymbolizationLoop()
+  loop = asan_symbolize.SymbolizationLoop(dsym_hint_producer=chrome_dsym_hints)
   loop.process_logfile()
 
 if __name__ == '__main__':