Skip to content

Commit

Permalink
[AST, CodeGen, Driver] Use llvm::is_contained (NFC)
Browse files Browse the repository at this point in the history
  • Loading branch information
kazutakahirata committed Oct 12, 2021
1 parent aefaf16 commit 57b40b5
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 28 deletions.
2 changes: 1 addition & 1 deletion clang/lib/AST/CXXInheritance.cpp
Expand Up @@ -465,7 +465,7 @@ void OverridingMethods::add(unsigned OverriddenSubobject,
UniqueVirtualMethod Overriding) {
SmallVectorImpl<UniqueVirtualMethod> &SubobjectOverrides
= Overrides[OverriddenSubobject];
if (llvm::find(SubobjectOverrides, Overriding) == SubobjectOverrides.end())
if (!llvm::is_contained(SubobjectOverrides, Overriding))
SubobjectOverrides.push_back(Overriding);
}

Expand Down
8 changes: 3 additions & 5 deletions clang/lib/AST/DeclCXX.cpp
Expand Up @@ -1776,7 +1776,7 @@ void CXXRecordDecl::removeConversion(const NamedDecl *ConvDecl) {
for (unsigned I = 0, E = Convs.size(); I != E; ++I) {
if (Convs[I].getDecl() == ConvDecl) {
Convs.erase(I);
assert(llvm::find(Convs, ConvDecl) == Convs.end() &&
assert(!llvm::is_contained(Convs, ConvDecl) &&
"conversion was found multiple times in unresolved set");
return;
}
Expand Down Expand Up @@ -3014,8 +3014,7 @@ CXXRecordDecl *ConstructorUsingShadowDecl::getNominatedBaseClass() const {
void BaseUsingDecl::anchor() {}

void BaseUsingDecl::addShadowDecl(UsingShadowDecl *S) {
assert(std::find(shadow_begin(), shadow_end(), S) == shadow_end() &&
"declaration already in set");
assert(!llvm::is_contained(shadows(), S) && "declaration already in set");
assert(S->getIntroducer() == this);

if (FirstUsingShadow.getPointer())
Expand All @@ -3024,8 +3023,7 @@ void BaseUsingDecl::addShadowDecl(UsingShadowDecl *S) {
}

void BaseUsingDecl::removeShadowDecl(UsingShadowDecl *S) {
assert(std::find(shadow_begin(), shadow_end(), S) != shadow_end() &&
"declaration not in set");
assert(llvm::is_contained(shadows(), S) && "declaration not in set");
assert(S->getIntroducer() == this);

// Remove S from the shadow decl chain. This is O(n) but hopefully rare.
Expand Down
5 changes: 2 additions & 3 deletions clang/lib/AST/ParentMapContext.cpp
Expand Up @@ -389,11 +389,10 @@ class ParentMapContext::ParentMap::ASTVisitor
auto *Vector = NodeOrVector.template get<ParentVector *>();
// Skip duplicates for types that have memoization data.
// We must check that the type has memoization data before calling
// std::find() because DynTypedNode::operator== can't compare all
// llvm::is_contained() because DynTypedNode::operator== can't compare all
// types.
bool Found = ParentStack.back().getMemoizationData() &&
std::find(Vector->begin(), Vector->end(),
ParentStack.back()) != Vector->end();
llvm::is_contained(*Vector, ParentStack.back());
if (!Found)
Vector->push_back(ParentStack.back());
}
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/AST/RecordLayoutBuilder.cpp
Expand Up @@ -240,7 +240,7 @@ EmptySubobjectMap::CanPlaceSubobjectAtOffset(const CXXRecordDecl *RD,
return true;

const ClassVectorTy &Classes = I->second;
if (llvm::find(Classes, RD) == Classes.end())
if (!llvm::is_contained(Classes, RD))
return true;

// There is already an empty class of the same type at this offset.
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/AST/Type.cpp
Expand Up @@ -3507,7 +3507,7 @@ bool RecordType::hasConstFields() const {
return true;
FieldTy = FieldTy.getCanonicalType();
if (const auto *FieldRecTy = FieldTy->getAs<RecordType>()) {
if (llvm::find(RecordTypeList, FieldRecTy) == RecordTypeList.end())
if (!llvm::is_contained(RecordTypeList, FieldRecTy))
RecordTypeList.push_back(FieldRecTy);
}
}
Expand Down
4 changes: 2 additions & 2 deletions clang/lib/AST/VTableBuilder.cpp
Expand Up @@ -1070,7 +1070,7 @@ void ItaniumVTableBuilder::AddThunk(const CXXMethodDecl *MD,
SmallVectorImpl<ThunkInfo> &ThunksVector = Thunks[MD];

// Check if we have this thunk already.
if (llvm::find(ThunksVector, Thunk) != ThunksVector.end())
if (llvm::is_contained(ThunksVector, Thunk))
return;

ThunksVector.push_back(Thunk);
Expand Down Expand Up @@ -2498,7 +2498,7 @@ class VFTableBuilder {
SmallVector<ThunkInfo, 1> &ThunksVector = Thunks[MD];

// Check if we have this thunk already.
if (llvm::find(ThunksVector, Thunk) != ThunksVector.end())
if (llvm::is_contained(ThunksVector, Thunk))
return;

ThunksVector.push_back(Thunk);
Expand Down
3 changes: 1 addition & 2 deletions clang/lib/CodeGen/CGDebugInfo.cpp
Expand Up @@ -4449,8 +4449,7 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const VarDecl *VD,
// Use DW_OP_deref to tell the debugger to load the pointer and treat it as
// the address of the variable.
if (UsePointerValue) {
assert(std::find(Expr.begin(), Expr.end(), llvm::dwarf::DW_OP_deref) ==
Expr.end() &&
assert(!llvm::is_contained(Expr, llvm::dwarf::DW_OP_deref) &&
"Debug info already contains DW_OP_deref.");
Expr.push_back(llvm::dwarf::DW_OP_deref);
}
Expand Down
15 changes: 5 additions & 10 deletions clang/lib/CodeGen/CGOpenMPRuntime.cpp
Expand Up @@ -7596,19 +7596,14 @@ class MappableExprsHandler {
Bits |= OMP_MAP_PTR_AND_OBJ;
if (AddIsTargetParamFlag)
Bits |= OMP_MAP_TARGET_PARAM;
if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_always)
!= MapModifiers.end())
if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_always))
Bits |= OMP_MAP_ALWAYS;
if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_close)
!= MapModifiers.end())
if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_close))
Bits |= OMP_MAP_CLOSE;
if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_present) !=
MapModifiers.end() ||
llvm::find(MotionModifiers, OMPC_MOTION_MODIFIER_present) !=
MotionModifiers.end())
if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_present) ||
llvm::is_contained(MotionModifiers, OMPC_MOTION_MODIFIER_present))
Bits |= OMP_MAP_PRESENT;
if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_ompx_hold) !=
MapModifiers.end())
if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_ompx_hold))
Bits |= OMP_MAP_OMPX_HOLD;
if (IsNonContiguous)
Bits |= OMP_MAP_NON_CONTIG;
Expand Down
3 changes: 1 addition & 2 deletions clang/lib/Driver/ToolChains/Clang.cpp
Expand Up @@ -4592,8 +4592,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
options::OPT_mllvm,
};
for (const auto &A : Args)
if (llvm::find(kBitcodeOptionBlacklist, A->getOption().getID()) !=
std::end(kBitcodeOptionBlacklist))
if (llvm::is_contained(kBitcodeOptionBlacklist, A->getOption().getID()))
D.Diag(diag::err_drv_unsupported_embed_bitcode) << A->getSpelling();

// Render the CodeGen options that need to be passed.
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Driver/ToolChains/Hexagon.cpp
Expand Up @@ -487,7 +487,7 @@ void HexagonToolChain::getHexagonLibraryPaths(const ArgList &Args,

std::string TargetDir = getHexagonTargetDir(D.getInstalledDir(),
D.PrefixDirs);
if (llvm::find(RootDirs, TargetDir) == RootDirs.end())
if (!llvm::is_contained(RootDirs, TargetDir))
RootDirs.push_back(TargetDir);

bool HasPIC = Args.hasArg(options::OPT_fpic, options::OPT_fPIC);
Expand Down

0 comments on commit 57b40b5

Please sign in to comment.