[PATCH] D95938: [llvm-objcopy] Use llvm::erase_if (NFC)

[Konstantin Ivlev via Phabricator via llvm-commits]

SSE4 created this revision.
Herald added subscribers: abrachet, sbc100.
Herald added a reviewer: alexshap.
Herald added a reviewer: rupprecht.
Herald added a reviewer: jhenderson.
SSE4 requested review of this revision.
Herald added subscribers: llvm-commits, MaskRay, aheejin.
Herald added a project: LLVM.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D95938

Files:
  llvm/tools/llvm-objcopy/COFF/Object.cpp
  llvm/tools/llvm-objcopy/MachO/Object.cpp
  llvm/tools/llvm-objcopy/wasm/Object.cpp


Index: llvm/tools/llvm-objcopy/wasm/Object.cpp
===================================================================
--- llvm/tools/llvm-objcopy/wasm/Object.cpp
+++ llvm/tools/llvm-objcopy/wasm/Object.cpp
@@ -26,9 +26,7 @@
 
 void Object::removeSections(function_ref<bool(const Section &)> ToRemove) {
   // TODO: remove reloc sections for the removed section, handle symbols, etc.
-  Sections.erase(
-      std::remove_if(std::begin(Sections), std::end(Sections), ToRemove),
-      std::end(Sections));
+  llvm::erase_if(Sections, ToRemove);
 }
 
 } // end namespace wasm
Index: llvm/tools/llvm-objcopy/MachO/Object.cpp
===================================================================
--- llvm/tools/llvm-objcopy/MachO/Object.cpp
+++ llvm/tools/llvm-objcopy/MachO/Object.cpp
@@ -26,9 +26,7 @@
 
 void SymbolTable::removeSymbols(
     function_ref<bool(const std::unique_ptr<SymbolEntry> &)> ToRemove) {
-  Symbols.erase(
-      std::remove_if(std::begin(Symbols), std::end(Symbols), ToRemove),
-      std::end(Symbols));
+  llvm::erase_if(Symbols, ToRemove);
 }
 
 void Object::updateLoadCommandIndexes() {
Index: llvm/tools/llvm-objcopy/COFF/Object.cpp
===================================================================
--- llvm/tools/llvm-objcopy/COFF/Object.cpp
+++ llvm/tools/llvm-objcopy/COFF/Object.cpp
@@ -40,17 +40,14 @@
 Error Object::removeSymbols(
     function_ref<Expected<bool>(const Symbol &)> ToRemove) {
   Error Errs = Error::success();
-  Symbols.erase(std::remove_if(std::begin(Symbols), std::end(Symbols),
-                               [ToRemove, &Errs](const Symbol &Sym) {
-                                 Expected<bool> ShouldRemove = ToRemove(Sym);
-                                 if (!ShouldRemove) {
-                                   Errs = joinErrors(std::move(Errs),
-                                                     ShouldRemove.takeError());
-                                   return false;
-                                 }
-                                 return *ShouldRemove;
-                               }),
-                std::end(Symbols));
+  llvm::erase_if(Symbols, [ToRemove, &Errs](const Symbol &Sym) {
+    Expected<bool> ShouldRemove = ToRemove(Sym);
+    if (!ShouldRemove) {
+      Errs = joinErrors(std::move(Errs), ShouldRemove.takeError());
+      return false;
+    }
+    return *ShouldRemove;
+  });
 
   updateSymbols();
   return Errs;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D95938.321058.patch
Type: text/x-patch
Size: 2413 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210203/c02bedf8/attachment.bin>