maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Use the Repl point to avoid the segfault when using ICF 

This addresses PR38918.

Differential Revision: https://reviews.llvm.org/D52202

llvm-svn: 342704
This commit is contained in:
Petr Hosek 2018-09-21 00:55:42 +00:00
parent 45b3ddc5a4
commit e717ae2117
3 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/InputSection.cpp
View File

@ -402,7 +402,7 @@ void InputSection::copyRelocations(uint8_t *Buf, ArrayRef<RelTy> Rels) {
}
if (RelTy::IsRela)
P->r_addend = Sym.getVA(Addend) - Section->getOutputSection()->Addr;
P->r_addend = Sym.getVA(Addend) - Section->Repl->getOutputSection()->Addr;
else if (Config->Relocatable)
Sec->Relocations.push_back({R_ABS, Type, Rel.r_offset, Addend, &Sym});
}

32
lld/test/ELF/emit-relocs-icf1.s Normal file
View File

@ -0,0 +1,32 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
# RUN: ld.lld --emit-relocs --icf=all %t.o -o %t
# RUN: llvm-readobj -r %t | FileCheck %s
# CHECK: Relocations [
# CHECK-NEXT: Section (3) .rela.text {
# CHECK-NEXT: 0x201000 R_X86_64_64 .text 0x11
# CHECK-NEXT: 0x201008 R_X86_64_64 .text 0x11
# CHECK-NEXT: 0x201011 R_X86_64_64 .rodata 0x0
# CHECK-NEXT: }
# CHECK-NEXT: ]
.rodata
quux:
.quad 0xfe
.section .text.foo,"ax"
foo:
.quad quux
.section .text.bar,"ax"
bar:
.quad quux
.text
.quad foo
.quad bar
.global _start
_start:
nop

36
lld/test/ELF/emit-relocs-icf2.s Normal file
View File

@ -0,0 +1,36 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
# RUN: ld.lld --gc-sections --emit-relocs --icf=all %t.o -o %t
# RUN: llvm-readobj -r %t | FileCheck %s
# CHECK: Relocations [
# CHECK-NEXT: Section (3) .rela.text {
# CHECK-NEXT: 0x201000 R_X86_64_64 .text 0x11
# CHECK-NEXT: 0x201008 R_X86_64_64 .text 0x11
# CHECK-NEXT: 0x201011 R_X86_64_64 .rodata 0x0
# CHECK-NEXT: }
# CHECK-NEXT: ]
.rodata
quux:
.quad 0xfe
.section .text.foo,"ax"
foo:
.quad quux
.section .text.bar,"ax"
bar:
.quad quux
.section .text.baz,"ax"
baz:
.quad quux
.text
.quad foo
.quad bar
.global _start
_start:
nop