[lld] r262968 - [lto] Don't add variables with private linkage to the symbol table.

[Sean Silva via llvm-commits]

Author: silvas
Date: Tue Mar  8 17:50:56 2016
New Revision: 262968

URL: http://llvm.org/viewvc/llvm-project?rev=262968&view=rev
Log:
[lto] Don't add variables with private linkage to the symbol table.

Summary:
This causes the issue in PR26872 to go away now that we aren't creating
symbols for the string literals, but that may just be concealing a
deeper problem, so best to keep that PR open.

Reviewers: rafael

Subscribers: Bigcheese, llvm-commits, joker.eph

Differential Revision: http://reviews.llvm.org/D17971

Added:
    lld/trunk/test/ELF/lto/linkage.ll
Modified:
    lld/trunk/ELF/InputFiles.cpp

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=262968&r1=262967&r2=262968&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Tue Mar  8 17:50:56 2016
@@ -440,10 +440,13 @@ void BitcodeFile::parse(DenseSet<StringR
   for (const BasicSymbolRef &Sym : Obj->symbols()) {
     uint8_t Visibility = STV_DEFAULT;
     const GlobalValue *GV = Obj->getSymbolGV(Sym.getRawDataRefImpl());
+    uint32_t Flags = Sym.getFlags();
     if (GV) {
       if (const Comdat *C = GV->getComdat())
         if (!KeptComdats.count(C))
           continue;
+      if (!(Flags & object::BasicSymbolRef::SF_Global))
+        continue;
       Visibility = getGvVisibility(GV);
     }
 
@@ -453,7 +456,6 @@ void BitcodeFile::parse(DenseSet<StringR
     StringRef NameRef = Saver.save(StringRef(Name));
 
     SymbolBody *Body;
-    uint32_t Flags = Sym.getFlags();
     bool IsWeak = Flags & BasicSymbolRef::SF_Weak;
     if (Flags & BasicSymbolRef::SF_Undefined) {
       Body = new (Alloc) Undefined(NameRef, IsWeak, Visibility, false);

Added: lld/trunk/test/ELF/lto/linkage.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/linkage.ll?rev=262968&view=auto
==============================================================================
--- lld/trunk/test/ELF/lto/linkage.ll (added)
+++ lld/trunk/test/ELF/lto/linkage.ll Tue Mar  8 17:50:56 2016
@@ -0,0 +1,9 @@
+; REQUIRES: x86
+; RUN: llvm-as %s -o %t1.o
+; RUN: ld.lld -m elf_x86_64 %t1.o %t1.o -o %t.so -shared
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+; Should not encounter a duplicate symbol error for @.str
+ at .str = private unnamed_addr constant [4 x i8] c"Hey\00", align 1