<div dir="ltr">Is this fixing a regression or did we never get this right? Just wondering which time window of performance measurements may be affected.<div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jun 15, 2016 at 10:56 AM, Rafael Espindola via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Wed Jun 15 12:56:10 2016<br>
New Revision: 272812<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=272812&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=272812&view=rev</a><br>
Log:<br>
Internalize symbols in comdats.<br>
<br>
We were dropping the CanOmitFromDynSym bit when creating undefined<br>
symbols because of comdat.<br>
<br>
Added:<br>
lld/trunk/test/ELF/lto/unnamed-addr-comdat.ll<br>
Modified:<br>
lld/trunk/ELF/InputFiles.cpp<br>
lld/trunk/ELF/SymbolTable.cpp<br>
lld/trunk/ELF/SymbolTable.h<br>
<br>
Modified: lld/trunk/ELF/InputFiles.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=272812&r1=272811&r2=272812&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=272812&r1=272811&r2=272812&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/InputFiles.cpp (original)<br>
+++ lld/trunk/ELF/InputFiles.cpp Wed Jun 15 12:56:10 2016<br>
@@ -351,7 +351,8 @@ SymbolBody *elf::ObjectFile<ELFT>::creat<br>
switch (Sym->st_shndx) {<br>
case SHN_UNDEF:<br>
return elf::Symtab<ELFT>::X<br>
- ->addUndefined(Name, Binding, Sym->st_other, Sym->getType(), this)<br>
+ ->addUndefined(Name, Binding, Sym->st_other, Sym->getType(),<br>
+ /*CanOmitFromDynSym*/ false, this)<br>
->body();<br>
case SHN_COMMON:<br>
return elf::Symtab<ELFT>::X<br>
@@ -368,7 +369,8 @@ SymbolBody *elf::ObjectFile<ELFT>::creat<br>
case STB_GNU_UNIQUE:<br>
if (Sec == &InputSection<ELFT>::Discarded)<br>
return elf::Symtab<ELFT>::X<br>
- ->addUndefined(Name, Binding, Sym->st_other, Sym->getType(), this)<br>
+ ->addUndefined(Name, Binding, Sym->st_other, Sym->getType(),<br>
+ /*CanOmitFromDynSym*/ false, this)<br>
->body();<br>
return elf::Symtab<ELFT>::X->addRegular(Name, *Sym, Sec)->body();<br>
}<br>
@@ -589,12 +591,12 @@ Symbol *BitcodeFile::createSymbol(const<br>
if (const Comdat *C = GV->getComdat())<br>
if (!KeptComdats.count(C))<br>
return Symtab<ELFT>::X->addUndefined(NameRef, Binding, Visibility, Type,<br>
- this);<br>
+ CanOmitFromDynSym, this);<br>
<br>
const Module &M = Obj.getModule();<br>
if (Flags & BasicSymbolRef::SF_Undefined)<br>
return Symtab<ELFT>::X->addUndefined(NameRef, Binding, Visibility, Type,<br>
- this);<br>
+ CanOmitFromDynSym, this);<br>
if (Flags & BasicSymbolRef::SF_Common) {<br>
// FIXME: Set SF_Common flag correctly for module asm symbols, and expose<br>
// size and alignment.<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=272812&r1=272811&r2=272812&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=272812&r1=272811&r2=272812&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.cpp (original)<br>
+++ lld/trunk/ELF/SymbolTable.cpp Wed Jun 15 12:56:10 2016<br>
@@ -220,17 +220,18 @@ std::string SymbolTable<ELFT>::conflictM<br>
<br>
template <class ELFT> Symbol *SymbolTable<ELFT>::addUndefined(StringRef Name) {<br>
return addUndefined(Name, STB_GLOBAL, STV_DEFAULT, /*Type*/ 0,<br>
- /*File*/ nullptr);<br>
+ /*CanOmitFromDynSym*/ false, /*File*/ nullptr);<br>
}<br>
<br>
template <class ELFT><br>
Symbol *SymbolTable<ELFT>::addUndefined(StringRef Name, uint8_t Binding,<br>
uint8_t StOther, uint8_t Type,<br>
+ bool CanOmitFromDynSym,<br>
InputFile *File) {<br>
Symbol *S;<br>
bool WasInserted;<br>
std::tie(S, WasInserted) =<br>
- insert(Name, Type, StOther & 3, /*CanOmitFromDynSym*/ false,<br>
+ insert(Name, Type, StOther & 3, CanOmitFromDynSym,<br>
/*IsUsedInRegularObj*/ !File || !isa<BitcodeFile>(File), File);<br>
if (WasInserted) {<br>
S->Binding = Binding;<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=272812&r1=272811&r2=272812&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=272812&r1=272811&r2=272812&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.h (original)<br>
+++ lld/trunk/ELF/SymbolTable.h Wed Jun 15 12:56:10 2016<br>
@@ -59,7 +59,7 @@ public:<br>
<br>
Symbol *addUndefined(StringRef Name);<br>
Symbol *addUndefined(StringRef Name, uint8_t Binding, uint8_t StOther,<br>
- uint8_t Type, InputFile *File);<br>
+ uint8_t Type, bool CanOmitFromDynSym, InputFile *File);<br>
<br>
Symbol *addRegular(StringRef Name, const Elf_Sym &Sym,<br>
InputSectionBase<ELFT> *Section);<br>
<br>
Added: lld/trunk/test/ELF/lto/unnamed-addr-comdat.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/unnamed-addr-comdat.ll?rev=272812&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/unnamed-addr-comdat.ll?rev=272812&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/lto/unnamed-addr-comdat.ll (added)<br>
+++ lld/trunk/test/ELF/lto/unnamed-addr-comdat.ll Wed Jun 15 12:56:10 2016<br>
@@ -0,0 +1,11 @@<br>
+; RUN: llvm-as %s -o %t.o<br>
+; RUN: ld.lld -m elf_x86_64 %t.o %t.o -o %t.so -save-temps -shared<br>
+; RUN: llvm-dis %t.so.lto.bc -o - | FileCheck %s<br>
+<br>
+target triple = "x86_64-unknown-linux-gnu"<br>
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
+<br>
+$foo = comdat any<br>
+@foo = linkonce_odr unnamed_addr constant i32 42, comdat<br>
+<br>
+; CHECK: @foo = internal unnamed_addr constant i32 42, comdat<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>