summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter/PECOFF
diff options
context:
space:
mode:
Diffstat (limited to 'lld/lib/ReaderWriter/PECOFF')
-rw-r--r--lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp8
-rw-r--r--lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp10
2 files changed, 8 insertions, 10 deletions
diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
index f7c9c7e8ea5..aa053bc9e28 100644
--- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
@@ -1052,12 +1052,10 @@ public:
return magic == llvm::sys::fs::file_magic::coff_object;
}
- std::error_code
- loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &,
- std::vector<std::unique_ptr<File>> &result) const override {
+ std::error_code loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &,
+ std::unique_ptr<File> &result) const override {
// Parse the memory buffer as PECOFF file.
- auto *file = new FileCOFF(std::move(mb), _ctx);
- result.push_back(std::unique_ptr<File>(file));
+ result = llvm::make_unique<FileCOFF>(std::move(mb), _ctx);
return std::error_code();
}
diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
index 76e37345a27..75d58071c48 100644
--- a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
@@ -367,11 +367,11 @@ public:
return magic == llvm::sys::fs::file_magic::coff_import_library;
}
- std::error_code
- loadFile(std::unique_ptr<MemoryBuffer> mb, const class Registry &,
- std::vector<std::unique_ptr<File> > &result) const override {
- auto *file = new FileImportLibrary(std::move(mb), _ctx.getMachineType());
- result.push_back(std::unique_ptr<File>(file));
+ std::error_code loadFile(std::unique_ptr<MemoryBuffer> mb,
+ const class Registry &,
+ std::unique_ptr<File> &result) const override {
+ result = llvm::make_unique<FileImportLibrary>(std::move(mb),
+ _ctx.getMachineType());
return std::error_code();
}
OpenPOWER on IntegriCloud