commit 0e49ef9540b54403bf1b8c40626275bc9883e8c9
author Fangrui Song <maskray@google.com> Tue Aug 21 00:13:52 2018 +0000
committer Fangrui Song <maskray@google.com> Tue Aug 21 00:13:52 2018 +0000
tree 4ec4c3c1bc6db0a53c48827d9ff2612725c8df93
parent 1d432ae2843a8e31132bf23582e0c3963604459e

[llvm-objcopy] Simplify find(X,Y) != X.end() with is_contained()

llvm-svn: 340241

llvm/tools/llvm-objcopy/llvm-objcopy.cpp

diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
index b2a6ed4..0bf9bc4 100644
--- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
@@ -505,7 +505,7 @@
   // Removes:
   if (!Config.ToRemove.empty()) {
     RemovePred = [&Config](const SectionBase &Sec) {
-      return find(Config.ToRemove, Sec.Name) != Config.ToRemove.end();
+      return is_contained(Config.ToRemove, Sec.Name);
     };
   }
 
@@ -573,7 +573,7 @@
   if (!Config.OnlyKeep.empty()) {
     RemovePred = [&Config, RemovePred, &Obj](const SectionBase &Sec) {
       // Explicitly keep these sections regardless of previous removes.
-      if (find(Config.OnlyKeep, Sec.Name) != Config.OnlyKeep.end())
+      if (is_contained(Config.OnlyKeep, Sec.Name))
         return false;
 
       // Allow all implicit removes.
@@ -595,7 +595,7 @@
   if (!Config.Keep.empty()) {
     RemovePred = [Config, RemovePred](const SectionBase &Sec) {
       // Explicitly keep these sections regardless of previous removes.
-      if (find(Config.Keep, Sec.Name) != Config.Keep.end())
+      if (is_contained(Config.Keep, Sec.Name))
         return false;
       // Otherwise defer to RemovePred.
       return RemovePred(Sec);