Index: ELF/Relocations.cpp =================================================================== --- ELF/Relocations.cpp +++ ELF/Relocations.cpp @@ -52,6 +52,7 @@ #include "Thunks.h" #include "lld/Common/Memory.h" #include "lld/Common/Strings.h" +#include "llvm/ADT/SmallSet.h" #include "llvm/Support/Endian.h" #include "llvm/Support/raw_ostream.h" #include @@ -432,14 +433,14 @@ // // If two or more symbols are at the same offset, and at least one of // them are copied by a copy relocation, all of them need to be copied. -// Otherwise, they would refer different places at runtime. +// Otherwise, they would refer to different places at runtime. template -static std::vector getSymbolsAt(SharedSymbol &SS) { +static SmallSet getSymbolsAt(SharedSymbol &SS) { typedef typename ELFT::Sym Elf_Sym; SharedFile &File = SS.getFile(); - std::vector Ret; + SmallSet Ret; for (const Elf_Sym &S : File.getGlobalELFSyms()) { if (S.st_shndx == SHN_UNDEF || S.st_shndx == SHN_ABS || S.st_value != SS.Value) @@ -447,7 +448,7 @@ StringRef Name = check(S.getName(File.getStringTable())); Symbol *Sym = Symtab->find(Name); if (auto *Alias = dyn_cast_or_null(Sym)) - Ret.push_back(Alias); + Ret.insert(Alias); } return Ret; } Index: test/ELF/Inputs/copy-rel-version.s =================================================================== --- /dev/null +++ test/ELF/Inputs/copy-rel-version.s @@ -0,0 +1,11 @@ +.data +.global foo@v1 +.type foo@v1, @object +.size foo@v1, 4 +.global foo@@v2 +.type foo@@v2, @object +.size foo@@v2, 8 +foo@v1: +foo@@v2: +.int 0 +.int 0 Index: test/ELF/copy-rel-version.s =================================================================== --- /dev/null +++ test/ELF/copy-rel-version.s @@ -0,0 +1,15 @@ +// REQUIRES: x86 +// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o +// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/copy-rel-version.s -o %t1.o +// RUN: echo "v1 {}; v2 {};" > %t.ver +// RUN: ld.lld %t1.o -shared -soname t1.so --version-script=%t.ver -o %t1.so +// RUN: ld.lld %t.o %t1.so -o %t +// RUN: llvm-readobj -t %t | FileCheck %s + +.global _start +_start: + leaq foo, %rax + +// CHECK: Name: foo ( +// CHECK-NEXT: Value: +// CHECK-NEXT: Size: 8