This is an archive of the discontinued LLVM Phabricator instance.

Differential D28851

[Assembler] Fix crash when assembling .quad for AArch32.
ClosedPublic

Authored by sanwou01 on Jan 18 2017, 3:09 AM.

Details

Reviewers
rengolin
olista01
Commits
rG771db6f895e4: [Assembler] Fix crash when assembling .quad for AArch32.
rL292373: [Assembler] Fix crash when assembling .quad for AArch32.
Summary

A 64-bit relocation does not exist in 32-bit ARMELF. Report an error
instead of crashing.

Fix PR23870.

Diff Detail

Event Timeline

sanwou01 created this revision.Jan 18 2017, 3:09 AM
Herald added a subscriber: aemerson. · View Herald TranscriptJan 18 2017, 3:09 AM
Harbormaster completed remote builds in B3027: Diff 84813.Jan 18 2017, 3:09 AM
sanwou01 added reviewers: rengolin, olista01.Jan 18 2017, 3:27 AM
rengolin accepted this revision.Jan 18 2017, 3:29 AM

Always good to move crashes into error messages. LGTM. Thanks!

This revision is now accepted and ready to land.Jan 18 2017, 3:29 AM
sanwou01 retitled this revision from Fix crash when assembling .quad for AArch32. to [Assembler] Fix crash when assembling .quad for AArch32..Jan 18 2017, 3:44 AM
sanwou01 edited the summary of this revision. (Show Details)
sanwou01 set the repository for this revision to rL LLVM.
sanwou01 added a subscriber: llvm-commits.
sanwou01 added a comment.Jan 18 2017, 4:08 AM

Thanks @rengolin.

I do not have commit access; could someone commit on my behalf?

Closed by commit rL292373: [Assembler] Fix crash when assembling .quad for AArch32. (authored by mcrosier). · Explain WhyJan 18 2017, 7:13 AM
This revision was automatically updated to reflect the committed changes.
mcrosier added a subscriber: mcrosier.Jan 18 2017, 7:15 AM
In D28851#649359, @sanwou01 wrote:

Thanks @rengolin.

I do not have commit access; could someone commit on my behalf?

Done. I also updated the PR accordingly.

Revision Contents

PathSize
lib/
Target/
ARM/
MCTargetDesc/
3 lines
test/
MC/
ARM/
9 lines

Diff 84813

lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp

Show First 20 Lines • Show All 357 Lines • ▼ Show 20 Lines
unsigned ARMAsmBackend::adjustFixupValue(const MCFixup &Fixup, uint64_t Value, unsigned ARMAsmBackend::adjustFixupValue(const MCFixup &Fixup, uint64_t Value,
bool IsPCRel, MCContext *Ctx, bool IsPCRel, MCContext *Ctx,
bool IsLittleEndian, bool IsLittleEndian,
bool IsResolved) const { bool IsResolved) const {
unsigned Kind = Fixup.getKind(); unsigned Kind = Fixup.getKind();
switch (Kind) { switch (Kind) {
default: 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_1:
case FK_Data_2: case FK_Data_2:
case FK_Data_4: case FK_Data_4:
return Value; return Value;
case FK_SecRel_2: case FK_SecRel_2:
return Value; return Value;
case FK_SecRel_4: case FK_SecRel_4:
return Value; return Value;
▲ Show 20 Lines • Show All 794 Lines • Show Last 20 Lines

test/MC/ARM/quad-relocation.s

  • This file was added.
@ 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: ^