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/Object/ObjectFile.cpp | |
| 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/Object/ObjectFile.cpp')
| -rw-r--r-- | llvm/lib/Object/ObjectFile.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/Object/ObjectFile.cpp b/llvm/lib/Object/ObjectFile.cpp index 591ed28..f5488c6 100644 --- a/llvm/lib/Object/ObjectFile.cpp +++ b/llvm/lib/Object/ObjectFile.cpp @@ -83,8 +83,9 @@ ObjectFile::createObjectFile(std::unique_ptr<MemoryBuffer> &Object, } ErrorOr<ObjectFile *> ObjectFile::createObjectFile(StringRef ObjectPath) { - std::unique_ptr<MemoryBuffer> File; - if (std::error_code EC = MemoryBuffer::getFile(ObjectPath, File)) + ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr = + MemoryBuffer::getFile(ObjectPath); + if (std::error_code EC = FileOrErr.getError()) return EC; - return createObjectFile(File); + return createObjectFile(FileOrErr.get()); } |