Author: Kazu Hirata Date: 2021-01-04T11:42:45-08:00 New Revision: 0edbc90ec565758f5243b83b1c0a13beaf21214f
URL: https://github.com/llvm/llvm-project/commit/0edbc90ec565758f5243b83b1c0a13beaf21214f DIFF: https://github.com/llvm/llvm-project/commit/0edbc90ec565758f5243b83b1c0a13beaf21214f.diff LOG: [DebugInfo] Use llvm::append_range (NFC) Added: Modified: llvm/include/llvm/DebugInfo/CodeView/TypeRecord.h llvm/lib/DebugInfo/DWARF/DWARFDie.cpp llvm/lib/DebugInfo/MSF/MSFBuilder.cpp llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp llvm/lib/DebugInfo/PDB/Native/TpiStreamBuilder.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/DebugInfo/CodeView/TypeRecord.h b/llvm/include/llvm/DebugInfo/CodeView/TypeRecord.h index 59bdd2a7c9f2..3b6d1b0b1a70 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/TypeRecord.h +++ b/llvm/include/llvm/DebugInfo/CodeView/TypeRecord.h @@ -697,7 +697,7 @@ class VFTableRecord : public TypeRecord { : TypeRecord(TypeRecordKind::VFTable), CompleteClass(CompleteClass), OverriddenVFTable(OverriddenVFTable), VFPtrOffset(VFPtrOffset) { MethodNames.push_back(Name); - MethodNames.insert(MethodNames.end(), Methods.begin(), Methods.end()); + llvm::append_range(MethodNames, Methods); } TypeIndex getCompleteClass() const { return CompleteClass; } diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp index 89b29b428fce..df411bf91041 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp @@ -479,8 +479,7 @@ void DWARFDie::collectChildrenAddressRanges( return; if (isSubprogramDIE()) { if (auto DIERangesOrError = getAddressRanges()) - Ranges.insert(Ranges.end(), DIERangesOrError.get().begin(), - DIERangesOrError.get().end()); + llvm::append_range(Ranges, DIERangesOrError.get()); else llvm::consumeError(DIERangesOrError.takeError()); } diff --git a/llvm/lib/DebugInfo/MSF/MSFBuilder.cpp b/llvm/lib/DebugInfo/MSF/MSFBuilder.cpp index c6fe764ab7e0..f946dd4860ac 100644 --- a/llvm/lib/DebugInfo/MSF/MSFBuilder.cpp +++ b/llvm/lib/DebugInfo/MSF/MSFBuilder.cpp @@ -204,8 +204,7 @@ Error MSFBuilder::setStreamSize(uint32_t Idx, uint32_t Size) { if (auto EC = allocateBlocks(AddedBlocks, AddedBlockList)) return EC; auto &CurrentBlocks = StreamData[Idx].second; - CurrentBlocks.insert(CurrentBlocks.end(), AddedBlockList.begin(), - AddedBlockList.end()); + llvm::append_range(CurrentBlocks, AddedBlockList); } else if (OldBlocks > NewBlocks) { // For shrinking, free all the Blocks in the Block map, update the stream // data, then shrink the directory. @@ -268,8 +267,7 @@ Expected<MSFLayout> MSFBuilder::generateLayout() { ExtraBlocks.resize(NumExtraBlocks); if (auto EC = allocateBlocks(NumExtraBlocks, ExtraBlocks)) return std::move(EC); - DirectoryBlocks.insert(DirectoryBlocks.end(), ExtraBlocks.begin(), - ExtraBlocks.end()); + llvm::append_range(DirectoryBlocks, ExtraBlocks); } else if (NumDirectoryBlocks < DirectoryBlocks.size()) { uint32_t NumUnnecessaryBlocks = DirectoryBlocks.size() - NumDirectoryBlocks; for (auto B : diff --git a/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp b/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp index 4a88391494cd..1d873b87b347 100644 --- a/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp @@ -116,7 +116,7 @@ StringMap<uint32_t> NamedStreamMap::entries() const { uint32_t NamedStreamMap::appendStringData(StringRef S) { uint32_t Offset = NamesBuffer.size(); - NamesBuffer.insert(NamesBuffer.end(), S.begin(), S.end()); + llvm::append_range(NamesBuffer, S); NamesBuffer.push_back('\0'); return Offset; } diff --git a/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp b/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp index 1296be3c9413..3e734c39e942 100644 --- a/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/SymbolCache.cpp @@ -519,8 +519,7 @@ SymbolCache::findLineTable(uint16_t Modi) const { return LHS[0].Addr < RHS[0].Addr; }); for (size_t I = 0; I < EntryList.size(); ++I) - ModuleLineTable.insert(ModuleLineTable.end(), EntryList[I].begin(), - EntryList[I].end()); + llvm::append_range(ModuleLineTable, EntryList[I]); return ModuleLineTable; } diff --git a/llvm/lib/DebugInfo/PDB/Native/TpiStreamBuilder.cpp b/llvm/lib/DebugInfo/PDB/Native/TpiStreamBuilder.cpp index b5e7b03e6917..5f4f497690b6 100644 --- a/llvm/lib/DebugInfo/PDB/Native/TpiStreamBuilder.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/TpiStreamBuilder.cpp @@ -91,7 +91,7 @@ void TpiStreamBuilder::addTypeRecords(ArrayRef<uint8_t> Types, updateTypeIndexOffsets(Sizes); TypeRecBuffers.push_back(Types); - TypeHashes.insert(TypeHashes.end(), Hashes.begin(), Hashes.end()); + llvm::append_range(TypeHashes, Hashes); } Error TpiStreamBuilder::finalize() { _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
