Skip to content

Commit b048f3f

Browse files
[clang] Use llvm::is_contained (NFC) (llvm#140985)
1 parent 8d06d4c commit b048f3f

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

clang/include/clang/Sema/Sema.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14629,8 +14629,8 @@ class Sema final : public SemaBase {
1462914629
bool SatisfactionStackContains(const NamedDecl *D,
1463014630
const llvm::FoldingSetNodeID &ID) const {
1463114631
const NamedDecl *Can = cast<NamedDecl>(D->getCanonicalDecl());
14632-
return llvm::find(SatisfactionStack, SatisfactionStackEntryTy{Can, ID}) !=
14633-
SatisfactionStack.end();
14632+
return llvm::is_contained(SatisfactionStack,
14633+
SatisfactionStackEntryTy{Can, ID});
1463414634
}
1463514635

1463614636
using SatisfactionStackEntryTy =

clang/lib/Interpreter/Interpreter.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -654,14 +654,13 @@ void Interpreter::ResetExecutor() { IncrExecutor.reset(); }
654654

655655
llvm::Error Interpreter::Execute(PartialTranslationUnit &T) {
656656
assert(T.TheModule);
657-
LLVM_DEBUG(llvm::dbgs()
658-
<< "execute-ptu "
659-
<< ((std::find(PTUs.begin(), PTUs.end(), T) != PTUs.end())
660-
? std::distance(PTUs.begin(),
661-
std::find(PTUs.begin(), PTUs.end(), T))
662-
: -1)
663-
<< ": [TU=" << T.TUPart << ", M=" << T.TheModule.get() << " ("
664-
<< T.TheModule->getName() << ")]\n");
657+
LLVM_DEBUG(
658+
llvm::dbgs() << "execute-ptu "
659+
<< (llvm::is_contained(PTUs, T)
660+
? std::distance(PTUs.begin(), llvm::find(PTUs, T))
661+
: -1)
662+
<< ": [TU=" << T.TUPart << ", M=" << T.TheModule.get()
663+
<< " (" << T.TheModule->getName() << ")]\n");
665664
if (!IncrExecutor) {
666665
auto Err = CreateExecutor();
667666
if (Err)

clang/unittests/ASTMatchers/ASTMatchersTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ testing::AssertionResult matchesConditionally(
110110
// Append additional arguments at the end to allow overriding the default
111111
// choices that we made above.
112112
llvm::copy(CompileArgs, std::back_inserter(Args));
113-
if (llvm::find(Args, "-target") == Args.end()) {
113+
if (!llvm::is_contained(Args, "-target")) {
114114
// Use an unknown-unknown triple so we don't instantiate the full system
115115
// toolchain. On Linux, instantiating the toolchain involves stat'ing
116116
// large portions of /usr/lib, and this slows down not only this test, but

clang/unittests/Tooling/ToolingTest.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ TEST(ClangToolTest, StripDependencyFileAdjuster) {
793793
Tool.run(Action.get());
794794

795795
auto HasFlag = [&FinalArgs](const std::string &Flag) {
796-
return llvm::find(FinalArgs, Flag) != FinalArgs.end();
796+
return llvm::is_contained(FinalArgs, Flag);
797797
};
798798
EXPECT_FALSE(HasFlag("-MD"));
799799
EXPECT_FALSE(HasFlag("-MMD"));
@@ -825,7 +825,7 @@ TEST(ClangToolTest, StripDependencyFileAdjusterShowIncludes) {
825825
Tool.run(Action.get());
826826

827827
auto HasFlag = [&FinalArgs](const std::string &Flag) {
828-
return llvm::find(FinalArgs, Flag) != FinalArgs.end();
828+
return llvm::is_contained(FinalArgs, Flag);
829829
};
830830
EXPECT_FALSE(HasFlag("/showIncludes"));
831831
EXPECT_FALSE(HasFlag("/showIncludes:user"));
@@ -858,7 +858,7 @@ TEST(ClangToolTest, StripDependencyFileAdjusterMsvc) {
858858
Tool.run(Action.get());
859859

860860
auto HasFlag = [&FinalArgs](const std::string &Flag) {
861-
return llvm::find(FinalArgs, Flag) != FinalArgs.end();
861+
return llvm::is_contained(FinalArgs, Flag);
862862
};
863863
EXPECT_TRUE(HasFlag("-MD"));
864864
EXPECT_TRUE(HasFlag("-MDd"));
@@ -891,7 +891,7 @@ TEST(ClangToolTest, StripPluginsAdjuster) {
891891
Tool.run(Action.get());
892892

893893
auto HasFlag = [&FinalArgs](const std::string &Flag) {
894-
return llvm::find(FinalArgs, Flag) != FinalArgs.end();
894+
return llvm::is_contained(FinalArgs, Flag);
895895
};
896896
EXPECT_FALSE(HasFlag("-Xclang"));
897897
EXPECT_FALSE(HasFlag("-add-plugin"));

0 commit comments

Comments
 (0)