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

[Petr Hosek via llvm-commits]

Author: phosek
Date: Thu Sep 20 17:55:42 2018
New Revision: 342704

URL: http://llvm.org/viewvc/llvm-project?rev=342704&view=rev
Log:
[ELF] Use the Repl point to avoid the segfault when using ICF

This addresses PR38918.

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

Added:
    lld/trunk/test/ELF/emit-relocs-icf1.s
    lld/trunk/test/ELF/emit-relocs-icf2.s
Modified:
    lld/trunk/ELF/InputSection.cpp

Modified: lld/trunk/ELF/InputSection.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=342704&r1=342703&r2=342704&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.cpp (original)
+++ lld/trunk/ELF/InputSection.cpp Thu Sep 20 17:55:42 2018
@@ -402,7 +402,7 @@ void InputSection::copyRelocations(uint8
       }
 
       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});
     }

Added: lld/trunk/test/ELF/emit-relocs-icf1.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emit-relocs-icf1.s?rev=342704&view=auto
==============================================================================
--- lld/trunk/test/ELF/emit-relocs-icf1.s (added)
+++ lld/trunk/test/ELF/emit-relocs-icf1.s Thu Sep 20 17:55:42 2018
@@ -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

Added: lld/trunk/test/ELF/emit-relocs-icf2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emit-relocs-icf2.s?rev=342704&view=auto
==============================================================================
--- lld/trunk/test/ELF/emit-relocs-icf2.s (added)
+++ lld/trunk/test/ELF/emit-relocs-icf2.s Thu Sep 20 17:55:42 2018
@@ -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