[llvm] b7db119 - [MC,ARM] Change a report_fatal_error to reportError

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2024-07-30T11:56:13-07:00
New Revision: b7db119eadde630f7ba7e4abc1ca6ee4fa8ccdfe

URL: https://github.com/llvm/llvm-project/commit/b7db119eadde630f7ba7e4abc1ca6ee4fa8ccdfe
DIFF: https://github.com/llvm/llvm-project/commit/b7db119eadde630f7ba7e4abc1ca6ee4fa8ccdfe.diff

LOG: [MC,ARM] Change a report_fatal_error to reportError

Similar to other "unsupported relocation type" diagnostics, we don't
report the internal fixup name.

Added: 
    

Modified: 
    llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp
    llvm/test/MC/ARM/Windows/invalid-relocation.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp
index c4427948d3b89..5a1ae90b84d74 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp
@@ -61,8 +61,8 @@ unsigned ARMWinCOFFObjectWriter::getRelocType(MCContext &Ctx,
 
   switch (FixupKind) {
   default: {
-    const MCFixupKindInfo &Info = MAB.getFixupKindInfo(Fixup.getKind());
-    report_fatal_error(Twine("unsupported relocation type: ") + Info.Name);
+    Ctx.reportError(Fixup.getLoc(), "unsupported relocation type");
+    return COFF::IMAGE_REL_ARM_ABSOLUTE;
   }
   case FK_Data_4:
     switch (Modifier) {

diff  --git a/llvm/test/MC/ARM/Windows/invalid-relocation.s b/llvm/test/MC/ARM/Windows/invalid-relocation.s
index db41570b062a2..821de8dd55604 100644
--- a/llvm/test/MC/ARM/Windows/invalid-relocation.s
+++ b/llvm/test/MC/ARM/Windows/invalid-relocation.s
@@ -1,4 +1,4 @@
-# RUN: not --crash llvm-mc -triple thumbv7-windows -incremental-linker-compatible -filetype obj -o /dev/null 2>&1 %s \
+# RUN: not llvm-mc -triple thumbv7-windows -incremental-linker-compatible -filetype obj -o /dev/null 2>&1 %s \
 # RUN:     | FileCheck %s
 
 	.def invalid_relocation
@@ -9,5 +9,4 @@
 	.thumb_func
 	adr r0, invalid_relocation+1
 
-# CHECK: LLVM ERROR: unsupported relocation type: fixup_t2_adr_pcrel_12
-
+# CHECK: 10:2: error: unsupported relocation type