diff options
| -rw-r--r-- | lld/ELF/SymbolTable.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp index 5545617487e..2e8759b8630 100644 --- a/lld/ELF/SymbolTable.cpp +++ b/lld/ELF/SymbolTable.cpp @@ -494,21 +494,16 @@ void SymbolTable::addShared(StringRef Name, SharedFile<ELFT> &File, // An undefined symbol with non default visibility must be satisfied // in the same DSO. - if (WasInserted) { - replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other, + auto Replace = [&](uint8_t Binding) { + replaceSymbol<SharedSymbol>(S, File, Name, Binding, Sym.st_other, Sym.getType(), Sym.st_value, Sym.st_size, Alignment, VerdefIndex); - return; - } + }; - if ((S->isUndefined() || S->isLazy()) && S->Visibility == STV_DEFAULT) { - uint8_t Binding = S->Binding; - replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other, - Sym.getType(), Sym.st_value, Sym.st_size, - Alignment, VerdefIndex); - - S->Binding = Binding; - } + if (WasInserted) + Replace(Sym.getBinding()); + else if (S->Visibility == STV_DEFAULT && (S->isUndefined() || S->isLazy())) + Replace(S->Binding); } Symbol *SymbolTable::addBitcode(StringRef Name, uint8_t Binding, |
