Don't drop dso_local in LTO.

LTO sets dso_local as an optimization, so don't clear it.

This avoid clearing it from undefined hidden symbols, which would then
fail the verifier.

llvm-svn: 322814

diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index 64e5186..a36d640 100644 (file)
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -639,7 +639,8 @@ LTO::addRegularLTO(BitcodeModule BM, ArrayRef<InputFile::Symbol> Syms,
       }
 
       // Set the 'local' flag based on the linker resolution for this symbol.
-      GV->setDSOLocal(Res.FinalDefinitionInLinkageUnit);
+      if (Res.FinalDefinitionInLinkageUnit)
+        GV->setDSOLocal(Res.FinalDefinitionInLinkageUnit);
     }
     // Common resolution: collect the maximum size/alignment over all commons.
     // We also record if we see an instance of a common as prevailing, so that

diff --git a/llvm/test/LTO/Resolution/X86/setting-dso-local.ll b/llvm/test/LTO/Resolution/X86/setting-dso-local.ll
new file mode 100644 (file)
index 0000000..817a818
--- /dev/null
+++ b/llvm/test/LTO/Resolution/X86/setting-dso-local.ll
@@ -0,0 +1,15 @@
+; RUN: llvm-as -o %t.o %s
+; RUN: llvm-lto2 run -o %t2.o %t.o -r=%t.o,_start,plx -r=%t.o,foobar,x
+; RUN: llvm-readelf --symbols %t2.o.0 | FileCheck %s
+
+; We used to fail the verifier by clearing dso_local from foobar
+
+; CHECK:  0000000000000000     0 NOTYPE  GLOBAL HIDDEN   UND foobar
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@foobar = external hidden global i32
+define i32* @_start() {
+  ret i32* @foobar
+}