MemoryBuffer now return an error_code and returns a OwningPtr<MemoryBuffer> via an out parm.

llvm-svn: 121958

1 files changed, 5 insertions, 4 deletions

diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp
index 781bca95eae..7a72cec753c 100644
--- a/llvm/tools/llvm-dis/llvm-dis.cpp
+++ b/llvm/tools/llvm-dis/llvm-dis.cpp
@@ -81,12 +81,13 @@ int main(int argc, char **argv) {
   std::string ErrorMessage;
   error_code ec;
   std::auto_ptr<Module> M;
+  OwningPtr<MemoryBuffer> BufferPtr;
 
-  if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, ec)) {
-    M.reset(ParseBitcodeFile(Buffer, Context, &ErrorMessage));
-    delete Buffer;
-  } else
+  if (ec = MemoryBuffer::getFileOrSTDIN(InputFilename, BufferPtr))
     ErrorMessage = ec.message();
+  else
+    M.reset(ParseBitcodeFile(BufferPtr.get(), Context, &ErrorMessage));
+  MemoryBuffer *Buffer = BufferPtr.take();
 
   if (M.get() == 0) {
     errs() << argv[0] << ": ";