Don't produce relocations for a difference in a section with no symbols.

We were producing a relocation for
----------------
.section foo,bar
La:
Lb:
 .long   La-Lb
--------------

but not for

---------------------
  .section foo,bar
zed:
La:
Lb:
 .long   La-Lb
----------------

This patch handles the case where both fragments are part of the first atom
in a section and there is no corresponding symbol to that atom.

This fixes pr21328.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221304 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-11-04 22:10:33 +00:00
parent 1aa0694c03
commit c326067040
3 changed files with 13 additions and 7 deletions

View File

@ -726,6 +726,10 @@ IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm,
return false;
}
// If they are not in the same section, we can't compute the diff.
if (&SecA != &SecB)
return false;
const MCFragment *FA = Asm.getSymbolData(SA).getFragment();
// Bail if the symbol has no fragment.
@ -733,12 +737,7 @@ IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm,
return false;
A_Base = FA->getAtom();
if (!A_Base)
return false;
B_Base = FB.getAtom();
if (!B_Base)
return false;
// If the atoms are the same, they are guaranteed to have the same address.
if (A_Base == B_Base)

View File

@ -12,7 +12,5 @@ L_var2:
// CHECK-NEXT: Section __data {
// CHECK-NEXT: 0x4 0 2 0 X86_64_RELOC_SUBTRACTOR 0 0x2
// CHECK-NEXT: 0x4 0 2 0 X86_64_RELOC_UNSIGNED 0 0x2
// CHECK-NEXT: 0x0 0 2 0 X86_64_RELOC_SUBTRACTOR 0 0x2
// CHECK-NEXT: 0x0 0 2 0 X86_64_RELOC_UNSIGNED 0 0x2
// CHECK-NEXT: }
// CHECK-NEXT: ]

View File

@ -0,0 +1,9 @@
// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin %s -o - | llvm-readobj -r | FileCheck %s
// CHECK: Relocations [
// CHECK-NEXT: ]
.section foo,bar
La:
Lb:
.long La-Lb