RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

[MC] Delete unnecessary diagnostic: "No relocation available to represent this relative expression"

Browse Source 
Replace

- error: No relocation available to represent this relative expression

with

+ error: symbol 'undef' can not be undefined in a subtraction expression

or

+ error: Cannot represent a difference across sections

Keep !IsPcRel as an assertion after the two diagnostic checks are done.

llvm-svn: 369239
This commit is contained in:
Fangrui Song 2019-08-19 07:59:35 +00:00
parent dbac100350
commit 73a8f9248f
5 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/MC/ELFObjectWriter.cpp
View File

@ -1441,22 +1441,7 @@ void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
MCContext &Ctx = Asm.getContext();
if (const MCSymbolRefExpr *RefB = Target.getSymB()) {
// Let A, B and C being the components of Target and R be the location of
// the fixup. If the fixup is not pcrel, we want to compute (A - B + C).
// If it is pcrel, we want to compute (A - B + C - R).
// In general, ELF has no relocations for -B. It can only represent (A + C)
// or (A + C - R). If B = R + K and the relocation is not pcrel, we can
// replace B to implement it: (A - R - K + C)
if (IsPCRel) {
Ctx.reportError(
Fixup.getLoc(),
"No relocation available to represent this relative expression");
return;
}
const auto &SymB = cast<MCSymbolELF>(RefB->getSymbol());
if (SymB.isUndefined()) {
Ctx.reportError(Fixup.getLoc(),
Twine("symbol '") + SymB.getName() +
@ -1474,6 +1459,7 @@ void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
uint64_t SymBOffset = Layout.getSymbolOffset(SymB);
uint64_t K = SymBOffset - FixupOffset;
assert(!IsPCRel && "should have been folded");
IsPCRel = true;
C -= K;
}

4
test/MC/AArch64/adr-diagnostics.s
View File

@ -17,7 +17,7 @@
// CHECK-NEXT: adr x3, (end + start)
// CHECK-NEXT: ^
adr x4, #(end - start)
// CHECK: error: No relocation available to represent this relative expression
// CHECK: error: symbol 'start' can not be undefined in a subtraction expression
// CHECK-NEXT: adr x4, #(end - start)
// CHECK-NEXT: ^
@ -38,6 +38,6 @@
// CHECK-NEXT: adrp x3, (end + start)
// CHECK-NEXT: ^
adrp x4, #(end - start)
// CHECK: error: No relocation available to represent this relative expression
// CHECK: error: symbol 'start' can not be undefined in a subtraction expression
// CHECK-NEXT: adrp x4, #(end - start)
// CHECK-NEXT: ^

2
test/MC/AArch64/error-location.s
View File

@ -10,7 +10,7 @@
// CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: expected relocatable expression
.word -undef
// CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: No relocation available to represent this relative expression
// CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: symbol 'undef' can not be undefined in a subtraction expression
adr x0, #a-undef
// CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: Cannot represent a difference across sections

2
test/MC/ARM/error-location.s
View File

@ -10,7 +10,7 @@
@ CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: expected relocatable expression
.word -undef
@ CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: No relocation available to represent this relative expression
@ CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: symbol 'undef' can not be undefined in a subtraction expression
adr r0, #a-undef
@ CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: Cannot represent a difference across sections

2
test/MC/ELF/bad-expr2.s
View File

@ -1,7 +1,7 @@
// RUN: not llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o /dev/null \
// RUN: 2>&1 | FileCheck %s
// CHECK: [[@LINE+2]]:{{[0-9]+}}: error: No relocation available to represent this relative expression
// CHECK: [[@LINE+2]]:{{[0-9]+}}: error: Cannot represent a difference across sections
// CHECK-NEXT: call foo - bar
call foo - bar