diff options
-rw-r--r-- | lld/ELF/SymbolTable.cpp | 4 | ||||
-rw-r--r-- | lld/ELF/Symbols.cpp | 4 | ||||
-rw-r--r-- | lld/ELF/Symbols.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp index 7e505d60bbf..1c5d9ae42d1 100644 --- a/lld/ELF/SymbolTable.cpp +++ b/lld/ELF/SymbolTable.cpp @@ -563,7 +563,7 @@ void SymbolTable::addLazyObject(StringRef Name, LazyObjFile &Obj) { bool WasInserted; std::tie(S, WasInserted) = insert(Name); if (WasInserted) { - replaceSymbol<LazyObject>(S, &Obj, Name, Symbol::UnknownType); + replaceSymbol<LazyObject>(S, Obj, Name, Symbol::UnknownType); return; } if (!S->isUndefined()) @@ -571,7 +571,7 @@ void SymbolTable::addLazyObject(StringRef Name, LazyObjFile &Obj) { // See comment for addLazyArchive above. if (S->isWeak()) - replaceSymbol<LazyObject>(S, &Obj, Name, S->Type); + replaceSymbol<LazyObject>(S, Obj, Name, S->Type); else if (InputFile *F = Obj.fetch()) addFile<ELFT>(F); } diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp index ab42fcd51a8..7f1cccffac2 100644 --- a/lld/ELF/Symbols.cpp +++ b/lld/ELF/Symbols.cpp @@ -236,9 +236,9 @@ InputFile *LazyArchive::fetch() { return createObjectFile(MBInfo.first, getFile()->getName(), MBInfo.second); } -LazyObjFile *LazyObject::getFile() { return cast<LazyObjFile>(File); } +LazyObjFile &LazyObject::getFile() { return *cast<LazyObjFile>(File); } -InputFile *LazyObject::fetch() { return getFile()->fetch(); } +InputFile *LazyObject::fetch() { return getFile().fetch(); } uint8_t Symbol::computeBinding() const { if (Config->Relocatable) diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h index fda9e6d6892..fca26ca99c1 100644 --- a/lld/ELF/Symbols.h +++ b/lld/ELF/Symbols.h @@ -295,12 +295,12 @@ private: // --start-lib and --end-lib options. class LazyObject : public Lazy { public: - LazyObject(InputFile *File, StringRef Name, uint8_t Type) - : Lazy(LazyObjectKind, File, Name, Type) {} + LazyObject(InputFile &File, StringRef Name, uint8_t Type) + : Lazy(LazyObjectKind, &File, Name, Type) {} static bool classof(const Symbol *S) { return S->kind() == LazyObjectKind; } - LazyObjFile *getFile(); + LazyObjFile &getFile(); InputFile *fetch(); }; |