summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter/ELF
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-08-13 00:31:46 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-08-13 00:31:46 +0000
commitbdc8f2fb83706d8e38b8c879194ebba772e1f17c (patch)
treea71e306fbb89c17915085a8a3fbe24087569fd4a /lld/lib/ReaderWriter/ELF
parent169284a67b1632a161e4970d06f2636cccb9005c (diff)
downloadbcm5719-llvm-bdc8f2fb83706d8e38b8c879194ebba772e1f17c.tar.gz
bcm5719-llvm-bdc8f2fb83706d8e38b8c879194ebba772e1f17c.zip
Update for llvm api change.
llvm-svn: 244849
Diffstat (limited to 'lld/lib/ReaderWriter/ELF')
-rw-r--r--lld/lib/ReaderWriter/ELF/OutputELFWriter.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/ELF/OutputELFWriter.cpp b/lld/lib/ReaderWriter/ELF/OutputELFWriter.cpp
index 78729393393..5d1addd304b 100644
--- a/lld/lib/ReaderWriter/ELF/OutputELFWriter.cpp
+++ b/lld/lib/ReaderWriter/ELF/OutputELFWriter.cpp
@@ -422,11 +422,14 @@ template <class ELFT> uint64_t OutputELFWriter<ELFT>::outputFileSize() const {
template <class ELFT>
std::error_code OutputELFWriter<ELFT>::writeOutput(const File &file,
StringRef path) {
- std::unique_ptr<FileOutputBuffer> buffer;
+
ScopedTask createOutputTask(getDefaultDomain(), "ELF Writer Create Output");
- if (std::error_code ec = FileOutputBuffer::create(
- path, outputFileSize(), buffer, FileOutputBuffer::F_executable))
+ ErrorOr<std::unique_ptr<FileOutputBuffer>> bufferOrErr =
+ FileOutputBuffer::create(path, outputFileSize(),
+ FileOutputBuffer::F_executable);
+ if (std::error_code ec = bufferOrErr.getError())
return ec;
+ std::unique_ptr<FileOutputBuffer> &buffer = *bufferOrErr;
createOutputTask.end();
ScopedTask writeTask(getDefaultDomain(), "ELF Writer write to memory");
OpenPOWER on IntegriCloud