Skip to content

Commit 1b30825

Browse files
MaskRaymemfrob
authored and
memfrob
committed
[llvm-symbolizer] Add compatibility aliases for --inlining={true,false}
D83530 removed --inlining={true,false} which were used by old asan_symbolize.py script. Add compatibility aliases so that old asan_symbolize.py and sanitizer binaries can work with new llvm-symbolizer. Reviewed By: thakis Differential Revision: https://reviews.llvm.org/D85228
1 parent 3b9ce55 commit 1b30825

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

llvm/test/tools/llvm-symbolizer/output-style-inlined.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ the option is not specified.
66

77
RUN: llvm-symbolizer --no-inlines -e %p/Inputs/addr.exe 0x40054d \
88
RUN: | FileCheck %s --check-prefix=LLVM --implicit-check-not=inctwo
9+
## Before 2020-08-04, asan_symbolize.py passed --inlining=false if 'symbolize_inline_frames'
10+
## is set to false. Support this compatibility alias for a while.
11+
RUN: llvm-symbolizer --inlining=false -e %p/Inputs/addr.exe 0x40054d \
12+
RUN: | FileCheck %s --check-prefix=LLVM --implicit-check-not=inctwo
913

1014
RUN: llvm-symbolizer --output-style=LLVM --no-inlines -e %p/Inputs/addr.exe 0x40054d \
1115
RUN: | FileCheck %s --check-prefix=LLVM --implicit-check-not=inctwo

llvm/test/tools/llvm-symbolizer/sym.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ RUN: llvm-symbolizer -inlines -print-address -pretty-print -obj=%p/Inputs/addr.e
2626
RUN: llvm-symbolizer -inlines -print-address -p -obj=%p/Inputs/addr.exe < %p/Inputs/addr.inp | FileCheck -check-prefix="PRETTY" %s
2727
RUN: llvm-symbolizer -i -print-address -pretty-print -obj=%p/Inputs/addr.exe < %p/Inputs/addr.inp | FileCheck -check-prefix="PRETTY" %s
2828
RUN: llvm-symbolizer -i -print-address -p -obj=%p/Inputs/addr.exe < %p/Inputs/addr.inp | FileCheck -check-prefix="PRETTY" %s
29+
## Before 2020-08-04, asan_symbolize.py passed --inlining=true.
30+
## Support this compatibility alias for a while.
31+
RUN: llvm-symbolizer --inlining=true --print-address -p --obj=%p/Inputs/addr.exe < %p/Inputs/addr.inp | FileCheck -check-prefix="PRETTY" %s
32+
2933
RUN: echo "0x1" > %t.input
3034
RUN: llvm-symbolizer -obj=%p/Inputs/zero < %t.input | FileCheck -check-prefix="ZERO" %s
3135

llvm/tools/llvm-symbolizer/Opts.td

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,7 @@ def : Flag<["-"], "i">, Alias<inlines>, HelpText<"Alias for --inlines">;
5858
def : F<"inlining", "Alias for --inlines">, Alias<inlines>;
5959
def : Flag<["-"], "p">, Alias<pretty_print>, HelpText<"Alias for --pretty-print">;
6060
def : Flag<["-"], "s">, Alias<basenames>, HelpText<"Alias for --basenames">;
61+
62+
// Compatibility aliases for old asan_symbolize.py and sanitizer binaries (before 2020-08).
63+
def : Flag<["--"], "inlining=true">, Alias<inlines>, HelpText<"Alias for --inlines">;
64+
def : Flag<["--"], "inlining=false">, Alias<no_inlines>, HelpText<"Alias for --no-inlines">;

0 commit comments

Comments
 (0)