Author: Kazu Hirata Date: 2020-12-23T21:44:39-08:00 New Revision: 9939cf5a5647729fdeb675264b3c70833e3055cf
URL: https://github.com/llvm/llvm-project/commit/9939cf5a5647729fdeb675264b3c70833e3055cf DIFF: https://github.com/llvm/llvm-project/commit/9939cf5a5647729fdeb675264b3c70833e3055cf.diff LOG: [ExecutionEngine, Linker] Use erase_if (NFC) Added: Modified: llvm/lib/ExecutionEngine/SectionMemoryManager.cpp llvm/lib/Linker/IRMover.cpp Removed: ################################################################################ diff --git a/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp b/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp index 138b18a1ddcb..6690dd07d99b 100644 --- a/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp +++ b/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp @@ -218,11 +218,9 @@ SectionMemoryManager::applyMemoryGroupPermissions(MemoryGroup &MemGroup, } // Remove all blocks which are now empty - MemGroup.FreeMem.erase(remove_if(MemGroup.FreeMem, - [](FreeMemBlock &FreeMB) { - return FreeMB.Free.allocatedSize() == 0; - }), - MemGroup.FreeMem.end()); + erase_if(MemGroup.FreeMem, [](FreeMemBlock &FreeMB) { + return FreeMB.Free.allocatedSize() == 0; + }); return std::error_code(); } diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp index b7a9beeeeb1a..5eeba0c0c3e7 100644 --- a/llvm/lib/Linker/IRMover.cpp +++ b/llvm/lib/Linker/IRMover.cpp @@ -905,7 +905,7 @@ IRLinker::linkAppendingVarProto(GlobalVariable *DstGV, getArrayElements(SrcGV->getInitializer(), SrcElements); if (IsNewStructor) { - auto It = remove_if(SrcElements, [this](Constant *E) { + erase_if(SrcElements, [this](Constant *E) { auto *Key = dyn_cast<GlobalValue>(E->getAggregateElement(2)->stripPointerCasts()); if (!Key) @@ -913,7 +913,6 @@ IRLinker::linkAppendingVarProto(GlobalVariable *DstGV, GlobalValue *DGV = getLinkedToGlobal(Key); return !shouldLink(DGV, *Key); }); - SrcElements.erase(It, SrcElements.end()); } uint64_t NewSize = DstNumElements + SrcElements.size(); ArrayType *NewType = ArrayType::get(EltTy, NewSize); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
