Skip to content

[clang] Use llvm::is_contained (NFC) #140985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2025
Merged

[clang] Use llvm::is_contained (NFC) #140985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clang/include/clang/Sema/Sema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
15 changes: 7 additions & 8 deletions clang/lib/Interpreter/Interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion clang/unittests/ASTMatchers/ASTMatchersTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions clang/unittests/Tooling/ToolingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down