[PATCH] D52202: [ELF] Use the Repl point to avoid the segfault when using ICF
Petr Hosek via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 19 18:01:47 PDT 2018
phosek updated this revision to Diff 166207.
phosek marked an inline comment as done.
Repository:
rLLD LLVM Linker
https://reviews.llvm.org/D52202
Files:
lld/ELF/InputSection.cpp
lld/test/ELF/emit-relocs-icf1.s
Index: lld/test/ELF/emit-relocs-icf1.s
===================================================================
--- /dev/null
+++ lld/test/ELF/emit-relocs-icf1.s
@@ -0,0 +1,23 @@
+# 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 (2) .rela.text {
+# CHECK-NEXT: 0x201000 R_X86_64_64 .text 0x11
+# CHECK-NEXT: }
+# CHECK-NEXT: ]
+
+.section .text.foo,"ax"
+
+.section .text.bar,"ax"
+
+.text
+relocs:
+.quad .text.foo
+.quad .text.bar
+
+.global _start
+_start:
+ nop
Index: lld/ELF/InputSection.cpp
===================================================================
--- lld/ELF/InputSection.cpp
+++ lld/ELF/InputSection.cpp
@@ -402,7 +402,7 @@
}
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});
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52202.166207.patch
Type: text/x-patch
Size: 1154 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180920/f2db5ce6/attachment.bin>
More information about the llvm-commits
mailing list