diff options
| author | Rui Ueyama <ruiu@google.com> | 2016-12-23 03:19:09 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2016-12-23 03:19:09 +0000 |
| commit | 58841b45d0157fdea281f91183a124ebabe57866 (patch) | |
| tree | 78c1b3d02adb1927332e42662829ab481ae6dc03 /lld/ELF/Driver.cpp | |
| parent | bf6007bd1bbce91c369e187efd26929f9fc74003 (diff) | |
| download | bcm5719-llvm-58841b45d0157fdea281f91183a124ebabe57866.tar.gz bcm5719-llvm-58841b45d0157fdea281f91183a124ebabe57866.zip | |
Remove Driver::OwningMB and instead use make().
We managed new MemoryBuffers in different ways in LinkerScript.cpp and
Driver.cpp. With this patch, they are managed in the same way.
llvm-svn: 290411
Diffstat (limited to 'lld/ELF/Driver.cpp')
| -rw-r--r-- | lld/ELF/Driver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 63072fe1995..a11dbc7cc47 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -122,7 +122,7 @@ LinkerDriver::getArchiveMembers(MemoryBufferRef MB) { // Take ownership of memory buffers created for members of thin archives. for (std::unique_ptr<MemoryBuffer> &MB : File->takeThinBuffers()) - OwningMBs.push_back(std::move(MB)); + make<std::unique_ptr<MemoryBuffer>>(std::move(MB)); return V; } @@ -180,7 +180,7 @@ Optional<MemoryBufferRef> LinkerDriver::readFile(StringRef Path) { } std::unique_ptr<MemoryBuffer> &MB = *MBOrErr; MemoryBufferRef MBRef = MB->getMemBufferRef(); - OwningMBs.push_back(std::move(MB)); // take MB ownership + make<std::unique_ptr<MemoryBuffer>>(std::move(MB)); // take MB ownership if (Cpio) Cpio->append(relativeToRoot(Path), MBRef.getBuffer()); |

