summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-07-06 17:43:22 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-07-06 17:43:22 +0000
commitc2199ecf1e833dc4b5e269141ecc72d3deb11616 (patch)
tree4178dc1b63afaed357bb4089a4b0c3240ce0012c /lld/lib/ReaderWriter
parent43f0aa6caf147789457bf64a7951bff4e3bef010 (diff)
downloadbcm5719-llvm-c2199ecf1e833dc4b5e269141ecc72d3deb11616.tar.gz
bcm5719-llvm-c2199ecf1e833dc4b5e269141ecc72d3deb11616.zip
Update for llvm api change.
llvm-svn: 212407
Diffstat (limited to 'lld/lib/ReaderWriter')
-rw-r--r--lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
index 0a4d2745e0d..59d429fd727 100644
--- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
@@ -958,11 +958,12 @@ public:
llvm::FileRemover coffFileRemover(*coffPath);
// Read and parse the COFF
- std::unique_ptr<MemoryBuffer> newmb;
- if (std::error_code ec = MemoryBuffer::getFile(*coffPath, newmb))
+ ErrorOr<std::unique_ptr<MemoryBuffer>> newmb =
+ MemoryBuffer::getFile(*coffPath);
+ if (std::error_code ec = newmb.getError())
return ec;
std::error_code ec;
- std::unique_ptr<FileCOFF> file(new FileCOFF(std::move(newmb), ec));
+ std::unique_ptr<FileCOFF> file(new FileCOFF(std::move(newmb.get()), ec));
if (ec)
return ec;
if (std::error_code ec = file->parse())
OpenPOWER on IntegriCloud