summaryrefslogtreecommitdiff
path: root/lld/unittests
diff options
context:
space:
mode:
authorPete Cooper <peter_cooper@apple.com>2016-03-30 23:58:24 +0000
committerPete Cooper <peter_cooper@apple.com>2016-03-30 23:58:24 +0000
commit5d8d1dd343bfc5fdb748a663a0cd9425cf7494b9 (patch)
tree0a0ca5143d22217ded0934742f7050e456b69775 /lld/unittests
parent33c88009ca1d75d4730ca2abd456ef326cdf14a8 (diff)
Convert readBinary to llvm::Error. NFC
Diffstat (limited to 'lld/unittests')
-rw-r--r--lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp2
-rw-r--r--lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
index ea505f86481..923f61b546d 100644
--- a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
+++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
@@ -22,7 +22,7 @@ static std::unique_ptr<NormalizedFile>
fromBinary(const uint8_t bytes[], unsigned length, StringRef archStr) {
StringRef sr((const char*)bytes, length);
std::unique_ptr<MemoryBuffer> mb(MemoryBuffer::getMemBuffer(sr, "", false));
- ErrorOr<std::unique_ptr<NormalizedFile>> r =
+ llvm::Expected<std::unique_ptr<NormalizedFile>> 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 2aff4413ef1..f44950a8d5a 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<MemoryBuffer> &mb,
EXPECT_FALSE(ec);
mb = std::move(mbOrErr.get());
- ErrorOr<std::unique_ptr<NormalizedFile>> r =
+ llvm::Expected<std::unique_ptr<NormalizedFile>> r =
lld::mach_o::normalized::readBinary(
mb, lld::MachOLinkingContext::archFromName(archStr));
EXPECT_FALSE(!r);