Author: Kazu Hirata Date: 2021-01-08T18:39:55-08:00 New Revision: 1c5b8482b7a212f2225bbfe122d39fb970bd176e
URL: https://github.com/llvm/llvm-project/commit/1c5b8482b7a212f2225bbfe122d39fb970bd176e DIFF: https://github.com/llvm/llvm-project/commit/1c5b8482b7a212f2225bbfe122d39fb970bd176e.diff LOG: [Tablegen] Use llvm::find_if (NFC) Added: Modified: llvm/utils/TableGen/CodeGenDAGPatterns.cpp llvm/utils/TableGen/DirectiveEmitter.cpp llvm/utils/TableGen/GlobalISel/GIMatchTree.cpp llvm/utils/TableGen/GlobalISelEmitter.cpp Removed: ################################################################################ diff --git a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp index 2f8abe6dffed..857d7f56ad77 100644 --- a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp +++ b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp @@ -3701,10 +3701,11 @@ void CodeGenDAGPatterns::parseInstructionPattern( for (unsigned i = 0; i != NumResults; ++i) { if (i == CGI.Operands.size()) { const std::string &OpName = - std::find_if(InstResults.begin(), InstResults.end(), - [](const std::pair<std::string, TreePatternNodePtr> &P) { - return P.second; - }) + llvm::find_if( + InstResults, + [](const std::pair<std::string, TreePatternNodePtr> &P) { + return P.second; + }) ->first; I.error("'" + OpName + "' set but does not appear in operand list!"); diff --git a/llvm/utils/TableGen/DirectiveEmitter.cpp b/llvm/utils/TableGen/DirectiveEmitter.cpp index 9e8aa4d9f74f..590fedbb02c5 100644 --- a/llvm/utils/TableGen/DirectiveEmitter.cpp +++ b/llvm/utils/TableGen/DirectiveEmitter.cpp @@ -273,9 +273,8 @@ void GenerateGetKind(const std::vector<Record *> &Records, raw_ostream &OS, StringRef Enum, const DirectiveLanguage &DirLang, StringRef Prefix, bool ImplicitAsUnknown) { - auto DefaultIt = std::find_if(Records.begin(), Records.end(), [](Record *R) { - return R->getValueAsBit("isDefault") == true; - }); + auto DefaultIt = llvm::find_if( + Records, [](Record *R) { return R->getValueAsBit("isDefault") == true; }); if (DefaultIt == Records.end()) { PrintError("At least one " + Enum + " must be defined as default."); @@ -312,10 +311,9 @@ void GenerateGetKindClauseVal(const DirectiveLanguage &DirLang, if (ClauseVals.size() <= 0) continue; - auto DefaultIt = - std::find_if(ClauseVals.begin(), ClauseVals.end(), [](Record *CV) { - return CV->getValueAsBit("isDefault") == true; - }); + auto DefaultIt = llvm::find_if(ClauseVals, [](Record *CV) { + return CV->getValueAsBit("isDefault") == true; + }); if (DefaultIt == ClauseVals.end()) { PrintError("At least one val in Clause " + C.getFormattedName() + diff --git a/llvm/utils/TableGen/GlobalISel/GIMatchTree.cpp b/llvm/utils/TableGen/GlobalISel/GIMatchTree.cpp index 96dc4fc94893..b7155398bd30 100644 --- a/llvm/utils/TableGen/GlobalISel/GIMatchTree.cpp +++ b/llvm/utils/TableGen/GlobalISel/GIMatchTree.cpp @@ -266,11 +266,10 @@ void GIMatchTreeBuilder::runStep() { LLVM_DEBUG(dbgs() << "Leaf contains multiple rules, drop after the first " "fully tested rule\n"); auto FirstFullyTested = - std::find_if(Leaves.begin(), Leaves.end(), - [](const GIMatchTreeBuilderLeafInfo &X) { - return X.isFullyTraversed() && X.isFullyTested() && - !X.getMatchDag().hasPostMatchPredicate(); - }); + llvm::find_if(Leaves, [](const GIMatchTreeBuilderLeafInfo &X) { + return X.isFullyTraversed() && X.isFullyTested() && + !X.getMatchDag().hasPostMatchPredicate(); + }); if (FirstFullyTested != Leaves.end()) FirstFullyTested++; diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp index 29ca558580fe..28c7d8b9634a 100644 --- a/llvm/utils/TableGen/GlobalISelEmitter.cpp +++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp @@ -2249,10 +2249,10 @@ class InstructionMatcher final : public PredicateListMatcher<PredicateMatcher> { } OperandMatcher &getOperand(unsigned OpIdx) { - auto I = std::find_if(Operands.begin(), Operands.end(), - [&OpIdx](const std::unique_ptr<OperandMatcher> &X) { - return X->getOpIdx() == OpIdx; - }); + auto I = llvm::find_if(Operands, + [&OpIdx](const std::unique_ptr<OperandMatcher> &X) { + return X->getOpIdx() == OpIdx; + }); if (I != Operands.end()) return **I; llvm_unreachable("Failed to lookup operand"); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
