llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-x86 @llvm/pr-subscribers-backend-mips Author: Matt Arsenault (arsenm) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/142039.diff 3 Files Affected: - (modified) llvm/test/tools/llvm-readobj/COFF/arm64-many-epilogs.s (+1-1) - (modified) llvm/test/tools/llvm-readobj/COFF/arm64-win-error2.s (+1-1) - (modified) llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp (+8-8) ``````````diff diff --git a/llvm/test/tools/llvm-readobj/COFF/arm64-many-epilogs.s b/llvm/test/tools/llvm-readobj/COFF/arm64-many-epilogs.s index 50b5fab935139..815e16af9f619 100644 --- a/llvm/test/tools/llvm-readobj/COFF/arm64-many-epilogs.s +++ b/llvm/test/tools/llvm-readobj/COFF/arm64-many-epilogs.s @@ -1,6 +1,6 @@ // REQUIRES: aarch64-registered-target // RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \ -// RUN: | not --crash llvm-readobj --unwind - 2>&1 | FileCheck %s +// RUN: | not llvm-readobj --unwind - 2>&1 | FileCheck %s // Older versions of LLVM had a bug where we would accidentally // truncate the number of epilogue scopes to a uint8_t; make diff --git a/llvm/test/tools/llvm-readobj/COFF/arm64-win-error2.s b/llvm/test/tools/llvm-readobj/COFF/arm64-win-error2.s index ede77a168cdc4..5c2e1d008b056 100644 --- a/llvm/test/tools/llvm-readobj/COFF/arm64-win-error2.s +++ b/llvm/test/tools/llvm-readobj/COFF/arm64-win-error2.s @@ -6,7 +6,7 @@ // REQUIRES: aarch64-registered-target // RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \ -// RUN: | not --crash llvm-readobj --unwind - 2>&1 | FileCheck %s +// RUN: | not llvm-readobj --unwind - 2>&1 | FileCheck %s // CHECK: LLVM ERROR: Malformed unwind data diff --git a/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp b/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp index ebee841e8acf2..c6e409c63ef3a 100644 --- a/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp +++ b/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp @@ -306,7 +306,7 @@ ErrorOr<SymbolRef> Decoder::getSymbolForLocation( std::string Buf; llvm::raw_string_ostream OS(Buf); logAllUnhandledErrors(AddressOrErr.takeError(), OS); - report_fatal_error(Twine(Buf)); + reportFatalUsageError(Twine(Buf)); } // We apply SymbolOffset here directly. We return it separately to allow // the caller to print it as an offset on the symbol name. @@ -1094,7 +1094,7 @@ bool Decoder::dumpXDataRecord(const COFFObjectFile &COFF, // A header is one or two words, followed by at least one word to describe // the unwind codes. Applicable to both ARM and AArch64. if (Contents.size() - Offset < 8) - report_fatal_error(".xdata must be at least 8 bytes in size"); + reportFatalUsageError(".xdata must be at least 8 bytes in size"); const ExceptionDataRecord XData(Data, isAArch64); DictScope XRS(SW, "ExceptionData"); @@ -1115,7 +1115,7 @@ bool Decoder::dumpXDataRecord(const COFFObjectFile &COFF, (XData.E() ? 0 : XData.EpilogueCount() * 4) - (XData.X() ? 8 : 0)) < (int64_t)ByteCodeLength) { SW.flush(); - report_fatal_error("Malformed unwind data"); + reportFatalUsageError("Malformed unwind data"); } if (XData.E()) { @@ -1178,7 +1178,7 @@ bool Decoder::dumpXDataRecord(const COFFObjectFile &COFF, std::string Buf; llvm::raw_string_ostream OS(Buf); logAllUnhandledErrors(Name.takeError(), OS); - report_fatal_error(Twine(Buf)); + reportFatalUsageError(Twine(Buf)); } ListScope EHS(SW, "ExceptionHandler"); @@ -1217,7 +1217,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF, std::string Buf; llvm::raw_string_ostream OS(Buf); logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS); - report_fatal_error(Twine(Buf)); + reportFatalUsageError(Twine(Buf)); } FunctionName = *FunctionNameOrErr; } @@ -1231,7 +1231,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF, std::string Buf; llvm::raw_string_ostream OS(Buf); logAllUnhandledErrors(Name.takeError(), OS); - report_fatal_error(Twine(Buf)); + reportFatalUsageError(Twine(Buf)); } SW.printString("ExceptionRecord", @@ -1276,7 +1276,7 @@ bool Decoder::dumpPackedEntry(const object::COFFObjectFile &COFF, std::string Buf; llvm::raw_string_ostream OS(Buf); logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS); - report_fatal_error(Twine(Buf)); + reportFatalUsageError(Twine(Buf)); } FunctionName = *FunctionNameOrErr; } @@ -1375,7 +1375,7 @@ bool Decoder::dumpPackedARM64Entry(const object::COFFObjectFile &COFF, std::string Buf; llvm::raw_string_ostream OS(Buf); logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS); - report_fatal_error(Twine(Buf)); + reportFatalUsageError(Twine(Buf)); } FunctionName = *FunctionNameOrErr; } `````````` </details> https://github.com/llvm/llvm-project/pull/142039 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits