From c6e7b8146a71b10ac41f452286e8aa57c1bf4c8b Mon Sep 17 00:00:00 2001 From: Pete Cooper Date: Wed, 30 Mar 2016 23:58:24 +0000 Subject: [PATCH] Convert readBinary to llvm::Error. NFC llvm-svn: 264973 --- lld/lib/ReaderWriter/MachO/File.h | 8 ++++---- lld/lib/ReaderWriter/MachO/MachONormalizedFile.h | 2 +- .../MachO/MachONormalizedFileBinaryReader.cpp | 13 +++++++------ .../MachONormalizedFileBinaryReaderTests.cpp | 2 +- .../MachONormalizedFileBinaryWriterTests.cpp | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lld/lib/ReaderWriter/MachO/File.h b/lld/lib/ReaderWriter/MachO/File.h index bfb150a440dc..7e0f0b2e89b4 100644 --- a/lld/lib/ReaderWriter/MachO/File.h +++ b/lld/lib/ReaderWriter/MachO/File.h @@ -228,8 +228,8 @@ protected: std::error_code doParse() override { // Convert binary file to normalized mach-o. auto normFile = normalized::readBinary(_mb, _ctx->arch()); - if (std::error_code ec = normFile.getError()) - return ec; + if (auto ec = normFile.takeError()) + return llvm::errorToErrorCode(std::move(ec)); // Convert normalized mach-o to atoms. if (auto ec = normalized::normalizedObjectToAtoms(this, **normFile, false)) return llvm::errorToErrorCode(std::move(ec)); @@ -317,8 +317,8 @@ public: std::error_code doParse() override { // Convert binary file to normalized mach-o. auto normFile = normalized::readBinary(_mb, _ctx->arch()); - if (std::error_code ec = normFile.getError()) - return ec; + if (auto ec = normFile.takeError()) + return llvm::errorToErrorCode(std::move(ec)); // Convert normalized mach-o to atoms. if (auto ec = normalized::normalizedDylibToAtoms(this, **normFile, false)) return llvm::errorToErrorCode(std::move(ec)); diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h index b6f264c41efb..5f7584a3a40f 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h @@ -289,7 +289,7 @@ bool sliceFromFatFile(MemoryBufferRef mb, MachOLinkingContext::Arch arch, uint32_t &offset, uint32_t &size); /// Reads a mach-o file and produces an in-memory normalized view. -ErrorOr> +llvm::Expected> readBinary(std::unique_ptr &mb, const MachOLinkingContext::Arch arch); diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp index 39860bbbdfa8..cca400b90823 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp @@ -199,7 +199,7 @@ bool sliceFromFatFile(MemoryBufferRef mb, MachOLinkingContext::Arch arch, } /// Reads a mach-o file and produces an in-memory normalized view. -ErrorOr> +llvm::Expected> readBinary(std::unique_ptr &mb, const MachOLinkingContext::Arch arch) { // Make empty NormalizedFile. @@ -220,7 +220,7 @@ readBinary(std::unique_ptr &mb, // Determine endianness and pointer size for mach-o file. bool is64, isBig; if (!isMachOHeader(mh, is64, isBig)) - return make_error_code(llvm::errc::executable_format_error); + return llvm::make_error("File is not a mach-o"); // Endian swap header, if needed. mach_header headerCopy; @@ -237,12 +237,13 @@ readBinary(std::unique_ptr &mb, start + (is64 ? sizeof(mach_header_64) : sizeof(mach_header)); StringRef lcRange(lcStart, smh->sizeofcmds); if (lcRange.end() > (start + objSize)) - return make_error_code(llvm::errc::executable_format_error); + return llvm::make_error("Load commands exceed file size"); // Get architecture from mach_header. f->arch = MachOLinkingContext::archFromCpuType(smh->cputype, smh->cpusubtype); if (f->arch != arch) { - return make_dynamic_error_code(Twine("file is wrong architecture. Expected " + return llvm::make_error( + Twine("file is wrong architecture. Expected " "(" + MachOLinkingContext::nameFromArch(arch) + ") found (" + MachOLinkingContext::nameFromArch(f->arch) @@ -268,7 +269,7 @@ readBinary(std::unique_ptr &mb, return false; }); if (ec) - return ec; + return llvm::errorCodeToError(ec); // Walk load commands looking for segments/sections and the symbol table. const data_in_code_entry *dataInCode = nullptr; @@ -484,7 +485,7 @@ readBinary(std::unique_ptr &mb, return false; }); if (ec) - return ec; + return llvm::errorCodeToError(ec); if (dataInCode) { // Convert on-disk data_in_code_entry array to DataInCode vector. diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp index ea505f864811..923f61b546dc 100644 --- a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp +++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp @@ -22,7 +22,7 @@ static std::unique_ptr fromBinary(const uint8_t bytes[], unsigned length, StringRef archStr) { StringRef sr((const char*)bytes, length); std::unique_ptr mb(MemoryBuffer::getMemBuffer(sr, "", false)); - ErrorOr> r = + llvm::Expected> r = lld::mach_o::normalized::readBinary( mb, lld::MachOLinkingContext::archFromName(archStr)); EXPECT_FALSE(!r); diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp index 2aff4413ef12..f44950a8d5ab 100644 --- a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp +++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp @@ -35,7 +35,7 @@ static void fromBinary(StringRef path, std::unique_ptr &mb, EXPECT_FALSE(ec); mb = std::move(mbOrErr.get()); - ErrorOr> r = + llvm::Expected> r = lld::mach_o::normalized::readBinary( mb, lld::MachOLinkingContext::archFromName(archStr)); EXPECT_FALSE(!r);