Author: Georgii Rymar Date: 2021-02-19T21:12:53-08:00 New Revision: 0d4f8a3f394f55b5fde7033bf009e5dacea1a775
URL: https://github.com/llvm/llvm-project/commit/0d4f8a3f394f55b5fde7033bf009e5dacea1a775 DIFF: https://github.com/llvm/llvm-project/commit/0d4f8a3f394f55b5fde7033bf009e5dacea1a775.diff LOG: [llvm-symbolizer] - Fix the crash in GNU output style with --no-inlines and missing input file. Fixes https://bugs.llvm.org/show_bug.cgi?id=48882. If the input file does not exist (or has a reading error), the following code will crash if there are two or more input addresses. ``` auto ResOrErr = Symbolizer.symbolizeInlinedCode( ModuleName, {Offset, object::SectionedAddress::UndefSection}); Printer << (error(ResOrErr) ? DILineInfo() : ResOrErr.get().getFrame(0)); ``` For the first address, `symbolizeInlinedCode` returns an error. For the second address, `symbolizeInlinedCode` returns an empty result (not an error) and `.getFrame(0)` will crash. Differential revision: https://reviews.llvm.org/D95609 (cherry picked from commit d22140687500f90830fe416d9c1e317f7c4535d5) Added: Modified: llvm/test/tools/llvm-symbolizer/output-style-inlined.test llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp Removed: ################################################################################ diff --git a/llvm/test/tools/llvm-symbolizer/output-style-inlined.test b/llvm/test/tools/llvm-symbolizer/output-style-inlined.test index 7e9f7e7ce180..1b8e3a2f22fb 100644 --- a/llvm/test/tools/llvm-symbolizer/output-style-inlined.test +++ b/llvm/test/tools/llvm-symbolizer/output-style-inlined.test @@ -28,3 +28,24 @@ RUN: | FileCheck %s --check-prefix=LLVM --implicit-check-not=inctwo LLVM: main GNU: inctwo + +## Check that we are able to produce an output properly when the --no-inlines option +## is specified, but a file doesn't exist. Check we report an error. + +RUN: llvm-symbolizer --output-style=GNU --obj=%p/Inputs/not.exist 0x1 0x2 --no-inlines 2>&1 \ +RUN: | FileCheck %s --check-prefix=NOT-EXIST-GNU -DMSG=%errc_ENOENT +RUN: llvm-symbolizer --output-style=LLVM --obj=%p/Inputs/not.exist 0x1 0x2 --no-inlines 2>&1 \ +RUN: | FileCheck %s --check-prefix=NOT-EXIST-LLVM -DMSG=%errc_ENOENT + +# NOT-EXIST-GNU: LLVMSymbolizer: error reading file: [[MSG]] +# NOT-EXIST-GNU-NEXT: ?? +# NOT-EXIST-GNU-NEXT: ??:0 +# NOT-EXIST-GNU-NEXT: ?? +# NOT-EXIST-GNU-NEXT: ??:0 + +# NOT-EXIST-LLVM: LLVMSymbolizer: error reading file: [[MSG]] +# NOT-EXIST-LLVM-NEXT: ?? +# NOT-EXIST-LLVM-NEXT: ??:0:0 +# NOT-EXIST-LLVM-EMPTY: +# NOT-EXIST-LLVM-NEXT: ?? +# NOT-EXIST-LLVM-NEXT: ??:0:0 diff --git a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp index 9c68acee0ae2..8734c2d74045 100644 --- a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp +++ b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp @@ -181,7 +181,12 @@ static void symbolizeInput(const opt::InputArgList &Args, uint64_t AdjustVMA, // the topmost function, which suits our needs better. auto ResOrErr = Symbolizer.symbolizeInlinedCode( ModuleName, {Offset, object::SectionedAddress::UndefSection}); - Printer << (error(ResOrErr) ? DILineInfo() : ResOrErr.get().getFrame(0)); + if (!ResOrErr || ResOrErr->getNumberOfFrames() == 0) { + error(ResOrErr); + Printer << DILineInfo(); + } else { + Printer << ResOrErr->getFrame(0); + } } else { auto ResOrErr = Symbolizer.symbolizeCode( ModuleName, {Offset, object::SectionedAddress::UndefSection}); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
