return Old;
}
-void SymbolTable::addShared(const SharedSymbol &New) {
+Symbol *SymbolTable::addShared(const SharedSymbol &New) {
Symbol *Old = insert(New);
mergeProperties(Old, New);
if (Old->isPlaceholder()) {
replaceSymbol(Old, &New);
- return;
+ return Old;
}
if (Old->Visibility == STV_DEFAULT && (Old->isUndefined() || Old->isLazy())) {
replaceSymbol(Old, &New);
Old->Binding = Binding;
}
+ return Old;
}
Symbol *SymbolTable::addBitcode(const Defined &New) {
return SymVector[It->second];
}
-template <class LazyT> void SymbolTable::addLazy(const LazyT &New) {
+template <class LazyT> Symbol *SymbolTable::addLazy(const LazyT &New) {
Symbol *Old = insert(New);
mergeProperties(Old, New);
if (Old->isPlaceholder()) {
replaceSymbol(Old, &New);
- return;
+ return Old;
}
if (!Old->isUndefined())
- return;
+ return Old;
// An undefined weak will not fetch archive members. See comment on Lazy in
// Symbols.h for the details.
replaceSymbol(Old, &New);
Old->Type = Type;
Old->Binding = STB_WEAK;
- return;
+ return Old;
}
if (InputFile *F = New.fetch())
parseFile(F);
+ return Old;
}
-void SymbolTable::addLazyArchive(const LazyArchive &New) { addLazy(New); }
+Symbol *SymbolTable::addLazyArchive(const LazyArchive &New) {
+ return addLazy(New);
+}
-void SymbolTable::addLazyObject(const LazyObject &New) { addLazy(New); }
+Symbol *SymbolTable::addLazyObject(const LazyObject &New) {
+ return addLazy(New);
+}
void SymbolTable::fetchLazy(Symbol *Sym) {
if (auto *S = dyn_cast<LazyArchive>(Sym)) {
Symbol *addUndefined(const Undefined &New);
Symbol *addDefined(const Defined &New);
- void addShared(const SharedSymbol &New);
- void addLazyArchive(const LazyArchive &New);
- void addLazyObject(const LazyObject &New);
+ Symbol *addShared(const SharedSymbol &New);
+ Symbol *addLazyArchive(const LazyArchive &New);
+ Symbol *addLazyObject(const LazyObject &New);
Symbol *addBitcode(const Defined &New);
Symbol *addCommon(const CommonSymbol &New);
llvm::DenseMap<StringRef, SharedFile *> SoNames;
private:
- template <class LazyT> void addLazy(const LazyT &New);
+ template <class LazyT> Symbol *addLazy(const LazyT &New);
std::vector<Symbol *> findByVersion(SymbolVersion Ver);
std::vector<Symbol *> findAllByVersion(SymbolVersion Ver);