diff options
| -rw-r--r-- | llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/MC/MachO/darwin-x86_64-diff-reloc-assign-2.s | 38 |
2 files changed, 42 insertions, 0 deletions
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp index b6f10ba9945..eb7c0b1a996 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp @@ -144,10 +144,14 @@ void X86MachObjectWriter::RecordX86_64Relocation(MachObjectWriter *Writer, } } else if (Target.getSymB()) { // A - B + constant const MCSymbol *A = &Target.getSymA()->getSymbol(); + if (A->isTemporary()) + A = &A->AliasedSymbol(); MCSymbolData &A_SD = Asm.getSymbolData(*A); const MCSymbolData *A_Base = Asm.getAtom(&A_SD); const MCSymbol *B = &Target.getSymB()->getSymbol(); + if (B->isTemporary()) + B = &B->AliasedSymbol(); MCSymbolData &B_SD = Asm.getSymbolData(*B); const MCSymbolData *B_Base = Asm.getAtom(&B_SD); diff --git a/llvm/test/MC/MachO/darwin-x86_64-diff-reloc-assign-2.s b/llvm/test/MC/MachO/darwin-x86_64-diff-reloc-assign-2.s new file mode 100644 index 00000000000..5d548790a7a --- /dev/null +++ b/llvm/test/MC/MachO/darwin-x86_64-diff-reloc-assign-2.s @@ -0,0 +1,38 @@ +// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | macho-dump --dump-section-data | FileCheck %s + +// Test case for rdar://9356266 + +// This tests that this expression does not cause a crash and produces these +// four relocation entries: +// Relocation information (__DATA,__data) 4 entries +// address pcrel length extern type scattered symbolnum/value +// 00000004 False long False SUB False 2 (__DATA,__data) +// 00000004 False long False UNSIGND False 2 (__DATA,__data) +// 00000000 False long False SUB False 2 (__DATA,__data) +// 00000000 False long False UNSIGND False 2 (__DATA,__data) + + .data +L_var1: +L_var2: +// This was working fine + .long L_var2 - L_var1 + + .set L_var3, . + .set L_var4, . +// But this was causing a crash + .long L_var4 - L_var3 + +// CHECK: ('_relocations', [ +// CHECK: # Relocation 0 +// CHECK: (('word-0', 0x4), +// CHECK: ('word-1', 0x54000002)), +// CHECK: # Relocation 1 +// CHECK: (('word-0', 0x4), +// CHECK: ('word-1', 0x4000002)), +// CHECK: # Relocation 2 +// CHECK: (('word-0', 0x0), +// CHECK: ('word-1', 0x54000002)), +// CHECK: # Relocation 3 +// CHECK: (('word-0', 0x0), +// CHECK: ('word-1', 0x4000002)), +// CHECK: ]) |
