Skip to content

Commit ccb5571

Browse files
authored
llvm-readobj: Use reportFatalUsageError (#142039)
1 parent 36b710a commit ccb5571

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

llvm/test/tools/llvm-readobj/COFF/arm64-many-epilogs.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: aarch64-registered-target
22
// RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \
3-
// RUN: | not --crash llvm-readobj --unwind - 2>&1 | FileCheck %s
3+
// RUN: | not llvm-readobj --unwind - 2>&1 | FileCheck %s
44

55
// Older versions of LLVM had a bug where we would accidentally
66
// truncate the number of epilogue scopes to a uint8_t; make

llvm/test/tools/llvm-readobj/COFF/arm64-win-error2.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// REQUIRES: aarch64-registered-target
88
// RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \
9-
// RUN: | not --crash llvm-readobj --unwind - 2>&1 | FileCheck %s
9+
// RUN: | not llvm-readobj --unwind - 2>&1 | FileCheck %s
1010

1111
// CHECK: LLVM ERROR: Malformed unwind data
1212

llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ ErrorOr<SymbolRef> Decoder::getSymbolForLocation(
306306
std::string Buf;
307307
llvm::raw_string_ostream OS(Buf);
308308
logAllUnhandledErrors(AddressOrErr.takeError(), OS);
309-
report_fatal_error(Twine(Buf));
309+
reportFatalUsageError(Twine(Buf));
310310
}
311311
// We apply SymbolOffset here directly. We return it separately to allow
312312
// the caller to print it as an offset on the symbol name.
@@ -1094,7 +1094,7 @@ bool Decoder::dumpXDataRecord(const COFFObjectFile &COFF,
10941094
// A header is one or two words, followed by at least one word to describe
10951095
// the unwind codes. Applicable to both ARM and AArch64.
10961096
if (Contents.size() - Offset < 8)
1097-
report_fatal_error(".xdata must be at least 8 bytes in size");
1097+
reportFatalUsageError(".xdata must be at least 8 bytes in size");
10981098

10991099
const ExceptionDataRecord XData(Data, isAArch64);
11001100
DictScope XRS(SW, "ExceptionData");
@@ -1115,7 +1115,7 @@ bool Decoder::dumpXDataRecord(const COFFObjectFile &COFF,
11151115
(XData.E() ? 0 : XData.EpilogueCount() * 4) -
11161116
(XData.X() ? 8 : 0)) < (int64_t)ByteCodeLength) {
11171117
SW.flush();
1118-
report_fatal_error("Malformed unwind data");
1118+
reportFatalUsageError("Malformed unwind data");
11191119
}
11201120

11211121
if (XData.E()) {
@@ -1178,7 +1178,7 @@ bool Decoder::dumpXDataRecord(const COFFObjectFile &COFF,
11781178
std::string Buf;
11791179
llvm::raw_string_ostream OS(Buf);
11801180
logAllUnhandledErrors(Name.takeError(), OS);
1181-
report_fatal_error(Twine(Buf));
1181+
reportFatalUsageError(Twine(Buf));
11821182
}
11831183

11841184
ListScope EHS(SW, "ExceptionHandler");
@@ -1217,7 +1217,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF,
12171217
std::string Buf;
12181218
llvm::raw_string_ostream OS(Buf);
12191219
logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS);
1220-
report_fatal_error(Twine(Buf));
1220+
reportFatalUsageError(Twine(Buf));
12211221
}
12221222
FunctionName = *FunctionNameOrErr;
12231223
}
@@ -1231,7 +1231,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF,
12311231
std::string Buf;
12321232
llvm::raw_string_ostream OS(Buf);
12331233
logAllUnhandledErrors(Name.takeError(), OS);
1234-
report_fatal_error(Twine(Buf));
1234+
reportFatalUsageError(Twine(Buf));
12351235
}
12361236

12371237
SW.printString("ExceptionRecord",
@@ -1276,7 +1276,7 @@ bool Decoder::dumpPackedEntry(const object::COFFObjectFile &COFF,
12761276
std::string Buf;
12771277
llvm::raw_string_ostream OS(Buf);
12781278
logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS);
1279-
report_fatal_error(Twine(Buf));
1279+
reportFatalUsageError(Twine(Buf));
12801280
}
12811281
FunctionName = *FunctionNameOrErr;
12821282
}
@@ -1375,7 +1375,7 @@ bool Decoder::dumpPackedARM64Entry(const object::COFFObjectFile &COFF,
13751375
std::string Buf;
13761376
llvm::raw_string_ostream OS(Buf);
13771377
logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS);
1378-
report_fatal_error(Twine(Buf));
1378+
reportFatalUsageError(Twine(Buf));
13791379
}
13801380
FunctionName = *FunctionNameOrErr;
13811381
}

0 commit comments

Comments
 (0)