diff options
| author | James Y Knight <jyknight@google.com> | 2019-02-27 21:47:35 +0000 |
|---|---|---|
| committer | James Y Knight <jyknight@google.com> | 2019-02-27 21:47:35 +0000 |
| commit | f33b1f49b76adb79b3483a13cff69f18a6c4f28e (patch) | |
| tree | 2e5a0eec9e94ec5682797a74be522dadb13053aa | |
| parent | b4a9d3e83e58abee46528540a209fa3dbe23d96e (diff) | |
| download | bcm5719-llvm-f33b1f49b76adb79b3483a13cff69f18a6c4f28e.tar.gz bcm5719-llvm-f33b1f49b76adb79b3483a13cff69f18a6c4f28e.zip | |
Fixup compilation/test failures after r354960 and r355013.
llvm-svn: 355034
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc | 10 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-readobj/thin-archive.test | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc b/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc index ede15f88a96..8150b7a09a0 100644 --- a/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc +++ b/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc @@ -39,8 +39,9 @@ bool __sanitizer_symbolize_code(const char *ModuleName, uint64_t ModuleOffset, llvm::symbolize::DIPrinter Printer(OS); // TODO: it is neccessary to set proper SectionIndex here. // object::SectionedAddress::UndefSection works for only absolute addresses. - auto ResOrErr = - getDefaultSymbolizer()->symbolizeInlinedCode(ModuleName, {ModuleOffset, object::SectionedAddress::UndefSection}); + auto ResOrErr = getDefaultSymbolizer()->symbolizeInlinedCode( + ModuleName, + {ModuleOffset, llvm::object::SectionedAddress::UndefSection}); Printer << (ResOrErr ? ResOrErr.get() : llvm::DIInliningInfo()); } return __sanitizer::internal_snprintf(Buffer, MaxLength, "%s", @@ -55,8 +56,9 @@ bool __sanitizer_symbolize_data(const char *ModuleName, uint64_t ModuleOffset, llvm::symbolize::DIPrinter Printer(OS); // TODO: it is neccessary to set proper SectionIndex here. // object::SectionedAddress::UndefSection works for only absolute addresses. - auto ResOrErr = - getDefaultSymbolizer()->symbolizeData(ModuleName, {ModuleOffset, object::SectionedAddress::UndefSection}); + auto ResOrErr = getDefaultSymbolizer()->symbolizeData( + ModuleName, + {ModuleOffset, llvm::object::SectionedAddress::UndefSection}); Printer << (ResOrErr ? ResOrErr.get() : llvm::DIGlobal()); } return __sanitizer::internal_snprintf(Buffer, MaxLength, "%s", diff --git a/llvm/test/tools/llvm-readobj/thin-archive.test b/llvm/test/tools/llvm-readobj/thin-archive.test index 3cdbaa51706..3f103a7a01f 100644 --- a/llvm/test/tools/llvm-readobj/thin-archive.test +++ b/llvm/test/tools/llvm-readobj/thin-archive.test @@ -50,6 +50,7 @@ # Overwrite one of the members with a member of a different size to show that # the size field in the member header is not relevant. +# RUN: rm -f %t/2.o # RUN: cp %t/1.o %t/2.o # RUN: llvm-readobj --file-headers %t.a | FileCheck %s --check-prefix=RESIZED |
