Use find_if

Author: arsenm

llvm/utils/TableGen/AsmMatcherEmitter.cpp

@@ -2576,23 +2576,20 @@ static void emitValidateOperandClass(const CodeGenTarget &Target,
         const Record *Class = RegClassesByHwMode[I];
         const HwModeSelect &ModeSelect = CGH.getHwModeSelect(Class);
 
-        bool Seen = false;
-        for (const HwModeSelect::PairType &P : ModeSelect.Items) {
-          if (P.first == M) {
-            const CodeGenRegisterClass *RegClass =
-                RegBank.getRegClass(P.second);
-
-            const ClassInfo *CI =
-                Info.RegisterClassClasses.at(RegClass->getDef());
-
-            OS << indent(8) << CI->Name << ",\n";
-            Seen = true;
-            break;
-          }
-        }
+        auto FoundMode =
+            find_if(ModeSelect.Items, [=](const HwModeSelect::PairType P) {
+              return P.first == M;
+            });
 
-        if (!Seen)
+        if (FoundMode == ModeSelect.Items.end()) {
           OS << indent(8) << "InvalidMatchClass, // Missing mode\n";
+        } else {
+          const CodeGenRegisterClass *RegClass =
+              RegBank.getRegClass(FoundMode->second);
+          const ClassInfo *CI =
+              Info.RegisterClassClasses.at(RegClass->getDef());
+          OS << indent(8) << CI->Name << ",\n";
+        }
       }
 
       OS << indent(6) << "},\n";

llvm/utils/TableGen/InstrInfoEmitter.cpp

@@ -1076,21 +1076,20 @@ void InstrInfoEmitter::run(raw_ostream &OS) {
         const Record *Class = RegClassByHwMode[I];
         const HwModeSelect &ModeSelect = CGH.getHwModeSelect(Class);
 
-        bool Seen = false;
-        for (const HwModeSelect::PairType &P : ModeSelect.Items) {
-          if (P.first == M) {
-            const CodeGenRegisterClass *RegClass =
-                RegBank.getRegClass(P.second);
-            OS << indent(4) << RegClass->getQualifiedIdName() << ",\n";
-            Seen = true;
-            break;
-          }
-        }
-
-        // If a RegClassByHwMode doesn't have an entry corresponding to a mode,
-        // pad with default register class.
-        if (!Seen)
+        auto FoundMode =
+            find_if(ModeSelect.Items, [=](const HwModeSelect::PairType P) {
+              return P.first == M;
+            });
+
+        if (FoundMode == ModeSelect.Items.end()) {
+          // If a RegClassByHwMode doesn't have an entry corresponding to a
+          // mode, pad with default register class.
           OS << indent(4) << "-1, // Missing mode entry\n";
+        } else {
+          const CodeGenRegisterClass *RegClass =
+              RegBank.getRegClass(FoundMode->second);
+          OS << indent(4) << RegClass->getQualifiedIdName() << ",\n";
+        }
       }
 
       OS << "  },\n";