https://github.com/kazutakahirata created
https://github.com/llvm/llvm-project/pull/140985
None
>From 9d1d55f8c5283b71cac4893cd5c39a38d4c55353 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <k...@google.com>
Date: Wed, 21 May 2025 14:09:49 -0700
Subject: [PATCH] [clang] Use llvm::is_contained (NFC)
---
clang/include/clang/Sema/Sema.h | 4 ++--
clang/lib/Interpreter/Interpreter.cpp | 15 +++++++--------
clang/unittests/ASTMatchers/ASTMatchersTest.h | 2 +-
clang/unittests/Tooling/ToolingTest.cpp | 8 ++++----
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index a994b845e11fc..9f945066280b5 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -14627,8 +14627,8 @@ class Sema final : public SemaBase {
bool SatisfactionStackContains(const NamedDecl *D,
const llvm::FoldingSetNodeID &ID) const {
const NamedDecl *Can = cast<NamedDecl>(D->getCanonicalDecl());
- return llvm::find(SatisfactionStack, SatisfactionStackEntryTy{Can, ID}) !=
- SatisfactionStack.end();
+ return llvm::is_contained(SatisfactionStack,
+ SatisfactionStackEntryTy{Can, ID});
}
using SatisfactionStackEntryTy =
diff --git a/clang/lib/Interpreter/Interpreter.cpp
b/clang/lib/Interpreter/Interpreter.cpp
index c04b2099a4b9a..4b407a0172adb 100644
--- a/clang/lib/Interpreter/Interpreter.cpp
+++ b/clang/lib/Interpreter/Interpreter.cpp
@@ -654,14 +654,13 @@ void Interpreter::ResetExecutor() { IncrExecutor.reset();
}
llvm::Error Interpreter::Execute(PartialTranslationUnit &T) {
assert(T.TheModule);
- LLVM_DEBUG(llvm::dbgs()
- << "execute-ptu "
- << ((std::find(PTUs.begin(), PTUs.end(), T) != PTUs.end())
- ? std::distance(PTUs.begin(),
- std::find(PTUs.begin(), PTUs.end(), T))
- : -1)
- << ": [TU=" << T.TUPart << ", M=" << T.TheModule.get() << " ("
- << T.TheModule->getName() << ")]\n");
+ LLVM_DEBUG(
+ llvm::dbgs() << "execute-ptu "
+ << (llvm::is_contained(PTUs, T)
+ ? std::distance(PTUs.begin(), llvm::find(PTUs, T))
+ : -1)
+ << ": [TU=" << T.TUPart << ", M=" << T.TheModule.get()
+ << " (" << T.TheModule->getName() << ")]\n");
if (!IncrExecutor) {
auto Err = CreateExecutor();
if (Err)
diff --git a/clang/unittests/ASTMatchers/ASTMatchersTest.h
b/clang/unittests/ASTMatchers/ASTMatchersTest.h
index 6eea39ae787fa..c1d4daea2c9f1 100644
--- a/clang/unittests/ASTMatchers/ASTMatchersTest.h
+++ b/clang/unittests/ASTMatchers/ASTMatchersTest.h
@@ -110,7 +110,7 @@ testing::AssertionResult matchesConditionally(
// Append additional arguments at the end to allow overriding the default
// choices that we made above.
llvm::copy(CompileArgs, std::back_inserter(Args));
- if (llvm::find(Args, "-target") == Args.end()) {
+ if (!llvm::is_contained(Args, "-target")) {
// Use an unknown-unknown triple so we don't instantiate the full system
// toolchain. On Linux, instantiating the toolchain involves stat'ing
// large portions of /usr/lib, and this slows down not only this test, but
diff --git a/clang/unittests/Tooling/ToolingTest.cpp
b/clang/unittests/Tooling/ToolingTest.cpp
index 8cdfffb54390e..cfa021a5ef137 100644
--- a/clang/unittests/Tooling/ToolingTest.cpp
+++ b/clang/unittests/Tooling/ToolingTest.cpp
@@ -793,7 +793,7 @@ TEST(ClangToolTest, StripDependencyFileAdjuster) {
Tool.run(Action.get());
auto HasFlag = [&FinalArgs](const std::string &Flag) {
- return llvm::find(FinalArgs, Flag) != FinalArgs.end();
+ return llvm::is_contained(FinalArgs, Flag);
};
EXPECT_FALSE(HasFlag("-MD"));
EXPECT_FALSE(HasFlag("-MMD"));
@@ -825,7 +825,7 @@ TEST(ClangToolTest,
StripDependencyFileAdjusterShowIncludes) {
Tool.run(Action.get());
auto HasFlag = [&FinalArgs](const std::string &Flag) {
- return llvm::find(FinalArgs, Flag) != FinalArgs.end();
+ return llvm::is_contained(FinalArgs, Flag);
};
EXPECT_FALSE(HasFlag("/showIncludes"));
EXPECT_FALSE(HasFlag("/showIncludes:user"));
@@ -858,7 +858,7 @@ TEST(ClangToolTest, StripDependencyFileAdjusterMsvc) {
Tool.run(Action.get());
auto HasFlag = [&FinalArgs](const std::string &Flag) {
- return llvm::find(FinalArgs, Flag) != FinalArgs.end();
+ return llvm::is_contained(FinalArgs, Flag);
};
EXPECT_TRUE(HasFlag("-MD"));
EXPECT_TRUE(HasFlag("-MDd"));
@@ -891,7 +891,7 @@ TEST(ClangToolTest, StripPluginsAdjuster) {
Tool.run(Action.get());
auto HasFlag = [&FinalArgs](const std::string &Flag) {
- return llvm::find(FinalArgs, Flag) != FinalArgs.end();
+ return llvm::is_contained(FinalArgs, Flag);
};
EXPECT_FALSE(HasFlag("-Xclang"));
EXPECT_FALSE(HasFlag("-add-plugin"));
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
