diff --git a/compiler-rt/lib/asan/scripts/asan_symbolize.py b/compiler-rt/lib/asan/scripts/asan_symbolize.py index d99e3441e925..a2e38238a97c 100755 --- a/compiler-rt/lib/asan/scripts/asan_symbolize.py +++ b/compiler-rt/lib/asan/scripts/asan_symbolize.py @@ -17,7 +17,7 @@ various parts of this script (see `--plugins`). This is useful for situations where it is necessary to handle site-specific quirks (e.g. binaries with debug symbols only accessible via a remote service) without having to modify the script itself. - + """ import argparse import bisect @@ -92,7 +92,7 @@ class LLVMSymbolizer(Symbolizer): '--use-symbol-table=true', '--demangle=%s' % demangle, '--functions=linkage', - '--inlining=true', + '--inlines', '--default-arch=%s' % self.default_arch] if self.system == 'Darwin': for hint in self.dsym_hints: diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp index 490c6fe89beb..77522a20ae9b 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp @@ -275,8 +275,8 @@ class LLVMSymbolizerProcess : public SymbolizerProcess { #endif const char *const inline_flag = common_flags()->symbolize_inline_frames - ? "--inlining=true" - : "--inlining=false"; + ? "--inlines" + : "--no-inlines"; int i = 0; argv[i++] = path_to_binary; argv[i++] = inline_flag;