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

This commit is contained in:
Kazu Hirata
2025-05-22 07:25:02 -07:00
committed by GitHub
parent 8d06d4c132
commit b048f3f8d7
4 changed files with 14 additions and 15 deletions

View File

@@ -14629,8 +14629,8 @@ public:
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 =

View File

@@ -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)

View File

@@ -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

View File

@@ -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"));