diff options
Diffstat (limited to 'contrib/llvm-project/llvm/lib/Object/Archive.cpp')
| -rw-r--r-- | contrib/llvm-project/llvm/lib/Object/Archive.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/contrib/llvm-project/llvm/lib/Object/Archive.cpp b/contrib/llvm-project/llvm/lib/Object/Archive.cpp index 1dffe007b9a9..2cf924123888 100644 --- a/contrib/llvm-project/llvm/lib/Object/Archive.cpp +++ b/contrib/llvm-project/llvm/lib/Object/Archive.cpp @@ -11,7 +11,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Object/Archive.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" @@ -136,8 +135,11 @@ BigArchiveMemberHeader::BigArchiveMemberHeader(const Archive *Parent, return; ErrorAsOutParameter ErrAsOutParam(Err); - if (Size < getSizeOf()) - *Err = createMemberHeaderParseError(this, RawHeaderPtr, Size); + if (Size < getSizeOf()) { + Error SubErr = createMemberHeaderParseError(this, RawHeaderPtr, Size); + if (Err) + *Err = std::move(SubErr); + } } // This gets the raw name from the ArMemHdr->Name field and checks that it is @@ -1142,7 +1144,7 @@ uint32_t Archive::getNumberOfSymbols() const { return read32le(buf); } -Expected<Optional<Archive::Child>> Archive::findSym(StringRef name) const { +Expected<std::optional<Archive::Child>> Archive::findSym(StringRef name) const { Archive::symbol_iterator bs = symbol_begin(); Archive::symbol_iterator es = symbol_end(); @@ -1155,7 +1157,7 @@ Expected<Optional<Archive::Child>> Archive::findSym(StringRef name) const { return MemberOrErr.takeError(); } } - return Optional<Child>(); + return std::nullopt; } // Returns true if archive file contains no member file. |