diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 21:15:27 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 21:15:27 +0000 |
commit | 61438b1c2636eabfa0d849224e8aa35c606959a6 (patch) | |
tree | 8f69d8385453fc726e058c8ab077cd78ff7d2b6a /tools/llvm-ar | |
parent | 63a0ff93c02542c95c698d4521c0ba19b4501b14 (diff) | |
download | llvm-61438b1c2636eabfa0d849224e8aa35c606959a6.tar.gz llvm-61438b1c2636eabfa0d849224e8aa35c606959a6.tar.bz2 llvm-61438b1c2636eabfa0d849224e8aa35c606959a6.tar.xz |
Simplify memory management with std::unique_ptr.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211538 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ar')
-rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 80a977c30b..2f0d7689b1 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -683,10 +683,10 @@ static void writeStringTable(raw_fd_ostream &Out, Out.seek(Pos); } -static void writeSymbolTable( - raw_fd_ostream &Out, ArrayRef<NewArchiveIterator> Members, - ArrayRef<MemoryBuffer *> Buffers, - std::vector<std::pair<unsigned, unsigned> > &MemberOffsetRefs) { +static void +writeSymbolTable(raw_fd_ostream &Out, ArrayRef<NewArchiveIterator> Members, + ArrayRef<std::unique_ptr<MemoryBuffer>> Buffers, + std::vector<std::pair<unsigned, unsigned>> &MemberOffsetRefs) { unsigned StartOffset = 0; unsigned MemberNum = 0; std::string NameBuf; @@ -696,7 +696,7 @@ static void writeSymbolTable( for (ArrayRef<NewArchiveIterator>::iterator I = Members.begin(), E = Members.end(); I != E; ++I, ++MemberNum) { - MemoryBuffer *MemberBuffer = Buffers[MemberNum]; + MemoryBuffer *MemberBuffer = Buffers[MemberNum].get(); ErrorOr<object::SymbolicFile *> ObjOrErr = object::SymbolicFile::createSymbolicFile( MemberBuffer, false, sys::fs::file_magic::unknown, &Context); @@ -757,7 +757,7 @@ static void performWriteOperation(ArchiveOperation Operation, std::vector<std::pair<unsigned, unsigned> > MemberOffsetRefs; - std::vector<MemoryBuffer *> MemberBuffers; + std::vector<std::unique_ptr<MemoryBuffer>> MemberBuffers; MemberBuffers.resize(NewMembers.size()); for (unsigned I = 0, N = NewMembers.size(); I < N; ++I) { @@ -779,7 +779,7 @@ static void performWriteOperation(ArchiveOperation Operation, failIfError(MemberBufferOrErr.getError()); MemberBuffer = std::move(MemberBufferOrErr.get()); } - MemberBuffers[I] = MemberBuffer.release(); + MemberBuffers[I].reset(MemberBuffer.release()); } if (Symtab) { @@ -807,7 +807,7 @@ static void performWriteOperation(ArchiveOperation Operation, } Out.seek(Pos); - const MemoryBuffer *File = MemberBuffers[MemberNum]; + const MemoryBuffer *File = MemberBuffers[MemberNum].get(); if (I->isNewMember()) { const char *FileName = I->getNew(); const sys::fs::file_status &Status = I->getStatus(); @@ -843,10 +843,6 @@ static void performWriteOperation(ArchiveOperation Operation, Out << '\n'; } - for (unsigned I = 0, N = MemberBuffers.size(); I < N; ++I) { - delete MemberBuffers[I]; - } - Output.keep(); Out.close(); sys::fs::rename(TemporaryOutput, ArchiveName); |