commit adf21f2a5634f2b33b6aa2dffae67df50c72a9f2
author Rafael Espindola <rafael.espindola@gmail.com> Sun Jul 06 17:43:13 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Sun Jul 06 17:43:13 2014 +0000
tree ab58d9d0ff55fb26656a0152b43539b19657b9dc
parent 178cadafc1a7fc576b6f4eb86a598c24247ccad7

Update the MemoryBuffer API to use ErrorOr.

llvm-svn: 212405

llvm/tools/llvm-mc/llvm-mc.cpp

diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp
index 72294ca..4c5b230 100644
--- a/llvm/tools/llvm-mc/llvm-mc.cpp
+++ b/llvm/tools/llvm-mc/llvm-mc.cpp
@@ -367,13 +367,13 @@
   if (!TheTarget)
     return 1;
 
-  std::unique_ptr<MemoryBuffer> BufferPtr;
-  if (std::error_code ec =
-          MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr)) {
-    errs() << ProgName << ": " << ec.message() << '\n';
+  ErrorOr<std::unique_ptr<MemoryBuffer>> BufferPtr =
+      MemoryBuffer::getFileOrSTDIN(InputFilename);
+  if (std::error_code EC = BufferPtr.getError()) {
+    errs() << ProgName << ": " << EC.message() << '\n';
     return 1;
   }
-  MemoryBuffer *Buffer = BufferPtr.release();
+  MemoryBuffer *Buffer = BufferPtr->release();
 
   SourceMgr SrcMgr;