Author: Kazu Hirata Date: 2023-03-15T08:46:32-07:00 New Revision: 8bdf38785888ddc7f2428918193b3f371ebea5cf
URL: https://github.com/llvm/llvm-project/commit/8bdf38785888ddc7f2428918193b3f371ebea5cf DIFF: https://github.com/llvm/llvm-project/commit/8bdf38785888ddc7f2428918193b3f371ebea5cf.diff LOG: Use *{Map,Set}::contains (NFC) Differential Revision: https://reviews.llvm.org/D146104 Added: Modified: bolt/include/bolt/Core/BinaryFunction.h clang-tools-extra/clang-tidy/bugprone/EasilySwappableParametersCheck.cpp clang/lib/AST/ASTContext.cpp clang/lib/Lex/Lexer.cpp clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp llvm/include/llvm/Support/CommandLine.h llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp llvm/lib/IR/DebugInfoMetadata.cpp llvm/lib/Support/CommandLine.cpp llvm/lib/Transforms/Scalar/GVNSink.cpp llvm/tools/llvm-exegesis/lib/Analysis.cpp llvm/utils/UnicodeData/UnicodeNameMappingGenerator.cpp mlir/lib/AsmParser/Parser.cpp mlir/lib/Dialect/GPU/TransformOps/GPUTransformOps.cpp mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp Removed: ################################################################################ diff --git a/bolt/include/bolt/Core/BinaryFunction.h b/bolt/include/bolt/Core/BinaryFunction.h index 036a4c5b0987a..7a99ce2481a1a 100644 --- a/bolt/include/bolt/Core/BinaryFunction.h +++ b/bolt/include/bolt/Core/BinaryFunction.h @@ -1754,7 +1754,7 @@ class BinaryFunction { /// Returns if this function is a child of \p Other function. bool isChildOf(const BinaryFunction &Other) const { - return llvm::is_contained(ParentFragments, &Other); + return ParentFragments.contains(&Other); } /// Set the profile data for the number of times the function was called. diff --git a/clang-tools-extra/clang-tidy/bugprone/EasilySwappableParametersCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/EasilySwappableParametersCheck.cpp index 0e21453234f2f..fa7285744be89 100644 --- a/clang-tools-extra/clang-tidy/bugprone/EasilySwappableParametersCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/EasilySwappableParametersCheck.cpp @@ -1581,7 +1581,7 @@ bool lazyMapOfSetsIntersectionExists(const MapTy &Map, const ElemTy &E1, return false; for (const auto &E1SetElem : E1Iterator->second) - if (llvm::is_contained(E2Iterator->second, E1SetElem)) + if (E2Iterator->second.contains(E1SetElem)) return true; return false; diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 14c9ab9c31a88..5196f1e3555ac 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -11961,7 +11961,7 @@ void ASTContext::forEachMultiversionedFunctionVersion( FD->getDeclContext()->getRedeclContext()->lookup(FD->getDeclName())) { FunctionDecl *CurFD = CurDecl->getAsFunction()->getMostRecentDecl(); if (CurFD && hasSameType(CurFD->getType(), FD->getType()) && - !llvm::is_contained(SeenDecls, CurFD)) { + !SeenDecls.contains(CurFD)) { SeenDecls.insert(CurFD); Pred(CurFD); } diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp index b9b13725edbc5..bc97ca18a2ebd 100644 --- a/clang/lib/Lex/Lexer.cpp +++ b/clang/lib/Lex/Lexer.cpp @@ -2279,7 +2279,7 @@ void Lexer::codeCompleteIncludedFile(const char *PathStart, ++CompletionPoint; if (Next == (IsAngled ? '>' : '"')) break; - if (llvm::is_contained(SlashChars, Next)) + if (SlashChars.contains(Next)) break; } diff --git a/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp b/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp index 4618d17577dd8..f0d3f43c414c6 100644 --- a/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp +++ b/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp @@ -233,7 +233,7 @@ void CheckerRegistry::initializeRegistry(const CheckerManager &Mgr) { // done recursively, its arguably cheaper, but for sure less error prone to // recalculate from scratch. auto IsEnabled = [&](const CheckerInfo *Checker) { - return llvm::is_contained(Tmp, Checker); + return Tmp.contains(Checker); }; for (const CheckerInfo &Checker : Data.Checkers) { if (!Checker.isEnabled(Mgr)) @@ -525,4 +525,3 @@ void CheckerRegistry::validateCheckerOptions() const { << SuppliedCheckerOrPackage; } } - diff --git a/llvm/include/llvm/Support/CommandLine.h b/llvm/include/llvm/Support/CommandLine.h index 43c769c1fd0ad..408853a60876b 100644 --- a/llvm/include/llvm/Support/CommandLine.h +++ b/llvm/include/llvm/Support/CommandLine.h @@ -315,7 +315,7 @@ class Option { } bool isInAllSubCommands() const { - return llvm::is_contained(Subs, &SubCommand::getAll()); + return Subs.contains(&SubCommand::getAll()); } //-------------------------------------------------------------------------=== diff --git a/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp b/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp index 55d939de426e3..0b32d69afeb28 100644 --- a/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp +++ b/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp @@ -388,7 +388,7 @@ class StatepointState { Register Reg = MO.getReg(); assert(Reg.isPhysical() && "Only physical regs are expected"); - if (isCalleeSaved(Reg) && (AllowGCPtrInCSR || !is_contained(GCRegs, Reg))) + if (isCalleeSaved(Reg) && (AllowGCPtrInCSR || !GCRegs.contains(Reg))) continue; LLVM_DEBUG(dbgs() << "Will spill " << printReg(Reg, &TRI) << " at index " diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp index a5d931769573d..479a51e1e0042 100644 --- a/llvm/lib/IR/DebugInfoMetadata.cpp +++ b/llvm/lib/IR/DebugInfoMetadata.cpp @@ -1667,7 +1667,7 @@ bool DIExpression::hasAllLocationOps(unsigned N) const { if (ExprOp.getOp() == dwarf::DW_OP_LLVM_arg) SeenOps.insert(ExprOp.getArg(0)); for (uint64_t Idx = 0; Idx < N; ++Idx) - if (!is_contained(SeenOps, Idx)) + if (!SeenOps.contains(Idx)) return false; return true; } diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp index 92e69db0c5b97..d3efb8b67be5c 100644 --- a/llvm/lib/Support/CommandLine.cpp +++ b/llvm/lib/Support/CommandLine.cpp @@ -2757,7 +2757,7 @@ StringMap<Option *> &cl::getRegisteredOptions(SubCommand &Sub) { initCommonOptions(); auto &Subs = GlobalParser->RegisteredSubCommands; (void)Subs; - assert(is_contained(Subs, &Sub)); + assert(Subs.contains(&Sub)); return Sub.OptionsMap; } diff --git a/llvm/lib/Transforms/Scalar/GVNSink.cpp b/llvm/lib/Transforms/Scalar/GVNSink.cpp index 34a9aaf4066e2..d0933ec418acf 100644 --- a/llvm/lib/Transforms/Scalar/GVNSink.cpp +++ b/llvm/lib/Transforms/Scalar/GVNSink.cpp @@ -154,7 +154,7 @@ class LockstepReverseIterator { void restrictToBlocks(SmallSetVector<BasicBlock *, 4> &Blocks) { for (auto II = Insts.begin(); II != Insts.end();) { - if (!llvm::is_contained(Blocks, (*II)->getParent())) { + if (!Blocks.contains((*II)->getParent())) { ActiveBlocks.remove((*II)->getParent()); II = Insts.erase(II); } else { @@ -272,7 +272,7 @@ class ModelledPHI { auto VI = Values.begin(); while (BI != Blocks.end()) { assert(VI != Values.end()); - if (!llvm::is_contained(NewBlocks, *BI)) { + if (!NewBlocks.contains(*BI)) { BI = Blocks.erase(BI); VI = Values.erase(VI); } else { diff --git a/llvm/tools/llvm-exegesis/lib/Analysis.cpp b/llvm/tools/llvm-exegesis/lib/Analysis.cpp index d1ec125f82ae7..2d7e17fc7399f 100644 --- a/llvm/tools/llvm-exegesis/lib/Analysis.cpp +++ b/llvm/tools/llvm-exegesis/lib/Analysis.cpp @@ -28,7 +28,7 @@ enum EscapeTag { kEscapeCsv, kEscapeHtml, kEscapeHtmlString }; template <EscapeTag Tag> void writeEscaped(raw_ostream &OS, const StringRef S); template <> void writeEscaped<kEscapeCsv>(raw_ostream &OS, const StringRef S) { - if (!llvm::is_contained(S, kCsvSep)) { + if (!S.contains(kCsvSep)) { OS << S; } else { // Needs escaping. diff --git a/llvm/utils/UnicodeData/UnicodeNameMappingGenerator.cpp b/llvm/utils/UnicodeData/UnicodeNameMappingGenerator.cpp index 83770e845d408..7bf9c8b03b418 100644 --- a/llvm/utils/UnicodeData/UnicodeNameMappingGenerator.cpp +++ b/llvm/utils/UnicodeData/UnicodeNameMappingGenerator.cpp @@ -361,9 +361,8 @@ int main(int argc, char **argv) { char32_t Codepoint = Entry.first; const std::string &Name = Entry.second; // Ignore names which are not valid. - if (Name.empty() || !llvm::all_of(Name, [](char C) { - return llvm::is_contained(Letters, C); - })) { + if (Name.empty() || + !llvm::all_of(Name, [](char C) { return Letters.contains(C); })) { continue; } printf("%06x: %s\n", static_cast<unsigned int>(Codepoint), Name.c_str()); diff --git a/mlir/lib/AsmParser/Parser.cpp b/mlir/lib/AsmParser/Parser.cpp index c44190b7b4a61..46c1ae976d9d4 100644 --- a/mlir/lib/AsmParser/Parser.cpp +++ b/mlir/lib/AsmParser/Parser.cpp @@ -389,7 +389,7 @@ ParseResult Parser::codeCompleteDialectOrElidedOpName(SMLoc loc) { const char *bufBegin = state.lex.getBufferBegin(); const char *it = loc.getPointer() - 1; for (; it > bufBegin && *it != '\n'; --it) - if (!llvm::is_contained(StringRef(" \t\r"), *it)) + if (!StringRef(" \t\r").contains(*it)) return true; return false; }; diff --git a/mlir/lib/Dialect/GPU/TransformOps/GPUTransformOps.cpp b/mlir/lib/Dialect/GPU/TransformOps/GPUTransformOps.cpp index 6d87604aee0ba..748d9e46ac153 100644 --- a/mlir/lib/Dialect/GPU/TransformOps/GPUTransformOps.cpp +++ b/mlir/lib/Dialect/GPU/TransformOps/GPUTransformOps.cpp @@ -124,7 +124,7 @@ checkMappingAttributeTypes(std::optional<TransformOpInterface> transformOp, DenseSet<Attribute> seen; for (Attribute map : forallOp.getMapping()->getValue()) { - if (llvm::is_contained(seen, map)) { + if (seen.contains(map)) { return failureHelper(transformOp, forallOp, "duplicated attribute, cannot map diff erent loops " "to the same processor"); diff --git a/mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp b/mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp index 7799fa9231c62..6964747cdebb6 100644 --- a/mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp +++ b/mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp @@ -152,7 +152,7 @@ LogicalResult scf::canonicalizeMinMaxOpInLoop(RewriterBase &rewriter, // Find all iteration variables among `minOp`'s operands add constrain them. for (Value operand : op->getOperands()) { // Skip duplicate ivs. - if (llvm::is_contained(allIvs, operand)) + if (allIvs.contains(operand)) continue; // If `operand` is an iteration variable: Find corresponding loop _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
