use the new MemoryBuffer interfaces to simplify error reporting in clients.

llvm-svn: 36900

1 files changed, 4 insertions, 7 deletions

diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp
index 6321551446a..97ec4c73061 100644
--- a/llvm/tools/llvm-dis/llvm-dis.cpp
+++ b/llvm/tools/llvm-dis/llvm-dis.cpp
@@ -54,14 +54,11 @@ int main(int argc, char **argv) {
 
     std::auto_ptr<Module> M;
    
-    MemoryBuffer *Buffer
-      = MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size());
-
-    if (Buffer == 0)
-      ErrorMessage = "Error reading file '" + InputFilename + "'";
-    else
+    if (MemoryBuffer *Buffer
+           = MemoryBuffer::getFileOrSTDIN(InputFilename, &ErrorMessage)) {
       M.reset(ParseBitcodeFile(Buffer, &ErrorMessage));
-    delete Buffer;
+      delete Buffer;
+    }
 
     if (M.get() == 0) {
       cerr << argv[0] << ": ";