[llvm] r292373 - [Assembler] Fix crash when assembling .quad for AArch32.
Chad Rosier via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 18 07:02:54 PST 2017
Author: mcrosier
Date: Wed Jan 18 09:02:54 2017
New Revision: 292373
URL: http://llvm.org/viewvc/llvm-project?rev=292373&view=rev
Log:
[Assembler] Fix crash when assembling .quad for AArch32.
A 64-bit relocation does not exist in 32-bit ARMELF. Report an error
instead of crashing.
PR23870
Patch by Sanne Wouda (sanwou01).
Differential Revision: https://reviews.llvm.org/D28851
Added:
llvm/trunk/test/MC/ARM/quad-relocation.s
Modified:
llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp?rev=292373&r1=292372&r2=292373&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp Wed Jan 18 09:02:54 2017
@@ -363,7 +363,8 @@ unsigned ARMAsmBackend::adjustFixupValue
unsigned Kind = Fixup.getKind();
switch (Kind) {
default:
- llvm_unreachable("Unknown fixup kind!");
+ if (Ctx) Ctx->reportError(Fixup.getLoc(), "bad relocation fixup type");
+ return 0;
case FK_Data_1:
case FK_Data_2:
case FK_Data_4:
Added: llvm/trunk/test/MC/ARM/quad-relocation.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/quad-relocation.s?rev=292373&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/quad-relocation.s (added)
+++ llvm/trunk/test/MC/ARM/quad-relocation.s Wed Jan 18 09:02:54 2017
@@ -0,0 +1,9 @@
+@ RUN: not llvm-mc -triple arm-arm-none-eabi -filetype obj < %s -o /dev/null 2>&1 | FileCheck %s
+
+ .align 3
+symbol:
+ .quad(symbol)
+
+@ CHECK: error: bad relocation fixup type
+@ CHECK-NEXT: .quad(symbol)
+@ CHECK-NEXT: ^
More information about the llvm-commits
mailing list