summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Object/Binary.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-07-06 17:43:13 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-07-06 17:43:13 +0000
commitadf21f2a5634f2b33b6aa2dffae67df50c72a9f2 (patch)
treeab58d9d0ff55fb26656a0152b43539b19657b9dc /llvm/lib/Object/Binary.cpp
parent178cadafc1a7fc576b6f4eb86a598c24247ccad7 (diff)
downloadbcm5719-llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.tar.gz
bcm5719-llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.zip
Update the MemoryBuffer API to use ErrorOr.
llvm-svn: 212405
Diffstat (limited to 'llvm/lib/Object/Binary.cpp')
-rw-r--r--llvm/lib/Object/Binary.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp
index 8d79a96662f..9f6a68556f9 100644
--- a/llvm/lib/Object/Binary.cpp
+++ b/llvm/lib/Object/Binary.cpp
@@ -75,8 +75,9 @@ ErrorOr<Binary *> object::createBinary(std::unique_ptr<MemoryBuffer> &Buffer,
}
ErrorOr<Binary *> object::createBinary(StringRef Path) {
- std::unique_ptr<MemoryBuffer> File;
- if (std::error_code EC = MemoryBuffer::getFileOrSTDIN(Path, File))
+ ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
+ MemoryBuffer::getFileOrSTDIN(Path);
+ if (std::error_code EC = FileOrErr.getError())
return EC;
- return createBinary(File);
+ return createBinary(FileOrErr.get());
}
OpenPOWER on IntegriCloud