diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:13 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:13 +0000 |
| commit | adf21f2a5634f2b33b6aa2dffae67df50c72a9f2 (patch) | |
| tree | ab58d9d0ff55fb26656a0152b43539b19657b9dc /llvm/lib/IRReader | |
| parent | 178cadafc1a7fc576b6f4eb86a598c24247ccad7 (diff) | |
| download | llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.zip llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.tar.gz llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.tar.bz2 | |
Update the MemoryBuffer API to use ErrorOr.
llvm-svn: 212405
Diffstat (limited to 'llvm/lib/IRReader')
| -rw-r--r-- | llvm/lib/IRReader/IRReader.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/llvm/lib/IRReader/IRReader.cpp b/llvm/lib/IRReader/IRReader.cpp index 00c6c0db..f8d2f5a 100644 --- a/llvm/lib/IRReader/IRReader.cpp +++ b/llvm/lib/IRReader/IRReader.cpp @@ -51,14 +51,15 @@ static Module *getLazyIRModule(MemoryBuffer *Buffer, SMDiagnostic &Err, Module *llvm::getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err, LLVMContext &Context) { - std::unique_ptr<MemoryBuffer> File; - if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, File)) { + ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr = + MemoryBuffer::getFileOrSTDIN(Filename); + if (std::error_code EC = FileOrErr.getError()) { Err = SMDiagnostic(Filename, SourceMgr::DK_Error, - "Could not open input file: " + ec.message()); + "Could not open input file: " + EC.message()); return nullptr; } - return getLazyIRModule(File.release(), Err, Context); + return getLazyIRModule(FileOrErr.get().release(), Err, Context); } Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, @@ -85,14 +86,15 @@ Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err, LLVMContext &Context) { - std::unique_ptr<MemoryBuffer> File; - if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, File)) { + ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr = + MemoryBuffer::getFileOrSTDIN(Filename); + if (std::error_code EC = FileOrErr.getError()) { Err = SMDiagnostic(Filename, SourceMgr::DK_Error, - "Could not open input file: " + ec.message()); + "Could not open input file: " + EC.message()); return nullptr; } - return ParseIR(File.get(), Err, Context); + return ParseIR(FileOrErr.get().get(), Err, Context); } //===----------------------------------------------------------------------===// |