<div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Tue, Apr 3, 2018 at 11:04 AM Rui Ueyama via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ruiu<br>
Date: Tue Apr 3 11:01:18 2018<br>
New Revision: 329092<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=329092&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=329092&view=rev</a><br>
Log:<br>
Make fetchIfLazy only fetch an object file. NFC.<br>
<br>
Previously, fetchIfLazy did more than the name says. Now, setting<br>
to UsedInRegularObj is moved to another function.<br>
<br>
Modified:<br>
lld/trunk/ELF/Driver.cpp<br>
lld/trunk/ELF/SymbolTable.cpp<br>
lld/trunk/ELF/SymbolTable.h<br>
<br>
Modified: lld/trunk/ELF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=329092&r1=329091&r2=329092&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=329092&r1=329091&r2=329092&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Driver.cpp (original)<br>
+++ lld/trunk/ELF/Driver.cpp Tue Apr 3 11:01:18 2018<br>
@@ -1017,6 +1017,20 @@ static void excludeLibs(opt::InputArgLis<br>
Sym->VersionId = VER_NDX_LOCAL;<br>
}<br>
<br>
+// Force Sym to be entered in the output. Used for -u or equivalent.<br>
+template <class ELFT> static void handleUndefined(StringRef Name) {<br>
+ Symbol *Sym = Symtab->find(Name);<br>
+ if (!Sym)<br>
+ return;<br>
+<br>
+ // Since symbol S may not be used inside the program, LTO may<br>
+ // eliminate it. Mark the symbol as "used" to prevent it.<br>
+ Sym->IsUsedInRegularObj = true;<br>
+<br>
+ if (Sym->isLazy())<br>
+ Symtab->fetchLazy<ELFT>(Sym);<br></blockquote><div><br></div><div>Because this template is only defined in the other .cpp file, we can't actually instantiate it here. As a consequence, I'm seeing link failures of lld after this commit.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+}<br>
+<br>
// Do actual linking. Note that when this function is called,<br>
// all linker scripts have already been parsed.<br>
template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {<br>
@@ -1081,16 +1095,12 @@ template <class ELFT> void LinkerDriver:<br>
<br>
// Handle the `--undefined <sym>` options.<br>
for (StringRef S : Config->Undefined)<br>
- if (Symbol *Sym = Symtab->find(S))<br>
- if (InputFile *F = Symtab->fetchIfLazy(Sym))<br>
- Symtab->addFile<ELFT>(F);<br>
+ handleUndefined<ELFT>(S);<br>
<br>
// If an entry symbol is in a static archive, pull out that file now<br>
// to complete the symbol table. After this, no new names except a<br>
// few linker-synthesized ones will be added to the symbol table.<br>
- if (Symbol *Sym = Symtab->find(Config->Entry))<br>
- if (InputFile *F = Symtab->fetchIfLazy(Sym))<br>
- Symtab->addFile<ELFT>(F);<br>
+ handleUndefined<ELFT>(Config->Entry);<br>
<br>
// Return if there were name resolution errors.<br>
if (errorCount())<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=329092&r1=329091&r2=329092&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=329092&r1=329091&r2=329092&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.cpp (original)<br>
+++ lld/trunk/ELF/SymbolTable.cpp Tue Apr 3 11:01:18 2018<br>
@@ -314,8 +314,8 @@ Symbol *SymbolTable::addUndefined(String<br>
// Symbols.h for the details.<br>
if (Binding == STB_WEAK)<br>
S->Type = Type;<br>
- else if (InputFile *F = Symtab->fetchIfLazy(S))<br>
- addFile<ELFT>(F);<br>
+ else<br>
+ fetchLazy<ELFT>(S);<br>
}<br>
return S;<br>
}<br>
@@ -574,15 +574,16 @@ void SymbolTable::addLazyObject(StringRe<br>
addFile<ELFT>(F);<br>
}<br>
<br>
-InputFile *SymbolTable::fetchIfLazy(Symbol *Sym) {<br>
- // Mark the symbol not to be eliminated by LTO<br>
- // even if it is a bitcode symbol.<br>
- Sym->IsUsedInRegularObj = true;<br>
- if (LazyArchive *L = dyn_cast<LazyArchive>(Sym))<br>
- return L->fetch();<br>
- if (LazyObject *L = dyn_cast<LazyObject>(Sym))<br>
- return cast<LazyObjFile>(L->File)->fetch();<br>
- return nullptr;<br>
+template <class ELFT> void SymbolTable::fetchLazy(Symbol *Sym) {<br>
+ if (auto *S = dyn_cast<LazyArchive>(Sym)) {<br>
+ if (InputFile *File = S->fetch())<br>
+ addFile<ELFT>(File);<br>
+ return;<br>
+ }<br>
+<br>
+ auto *S = cast<LazyObject>(Sym);<br>
+ if (InputFile *File = cast<LazyObjFile>(S->File)->fetch())<br>
+ addFile<ELFT>(File);<br>
}<br>
<br>
// Initialize DemangledSyms with a map from demangled symbols to symbol<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=329092&r1=329091&r2=329092&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=329092&r1=329091&r2=329092&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.h (original)<br>
+++ lld/trunk/ELF/SymbolTable.h Tue Apr 3 11:01:18 2018<br>
@@ -77,7 +77,7 @@ public:<br>
uint8_t Visibility, bool CanOmitFromDynSym,<br>
InputFile *File);<br>
<br>
- InputFile *fetchIfLazy(Symbol *Sym);<br>
+ template <class ELFT> void fetchLazy(Symbol *Sym);<br>
<br>
void scanVersionScript();<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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></div>