TableGen: allow use of uint64_t for available features mask.

[oota-llvm.git] / lib / TableGen / Main.cpp

diff --git a/lib/TableGen/Main.cpp b/lib/TableGen/Main.cpp
index 191307a66bc217004db547ab1f4306aec96c5cd0..e317fbfa373da2070fea70ee3f0f5dd2c4ffa760 100644 (file)
--- a/lib/TableGen/Main.cpp
+++ b/lib/TableGen/Main.cpp
@@ -81,13 +81,14 @@ int TableGenMain(char *argv0, TableGenMainFn *MainFn) {
   RecordKeeper Records;
 
   // Parse the input file.
-  std::unique_ptr<MemoryBuffer> File;
-  if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, File)) {
-    errs() << "Could not open input file '" << InputFilename << "': "
-           << ec.message() <<"\n";
+  ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
+      MemoryBuffer::getFileOrSTDIN(InputFilename);
+  if (std::error_code EC = FileOrErr.getError()) {
+    errs() << "Could not open input file '" << InputFilename
+           << "': " << EC.message() << "\n";
     return 1;
   }
-  MemoryBuffer *F = File.release();
+  MemoryBuffer *F = FileOrErr.get().release();
 
   // Tell SrcMgr about this buffer, which is what TGParser will pick up.
   SrcMgr.AddNewSourceBuffer(F, SMLoc());