Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-17 08:21:13 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[clang] Use llvm::is_contained (NFC)

Browse Source
This commit is contained in:
Kazu Hirata 2021-10-15 10:07:08 -07:00
parent 59b94c4a60
commit 6a154e606e
3 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/ASTMatchers/ASTMatchersInternal.h
View File

@ -2249,11 +2249,7 @@ public:
bool matchesNode(const T &Node) const override {
Optional<StringRef> OptOpName = getOpName(Node);
if (!OptOpName)
return false;
return llvm::any_of(Names, [OpName = *OptOpName](const std::string &Name) {
return Name == OpName;
});
return OptOpName && llvm::is_contained(Names, *OptOpName);
}
private:

29
clang/lib/CodeGen/CGOpenMPRuntime.cpp
View File

@ -8580,10 +8580,8 @@ private:
if (!C)
continue;
MapKind Kind = Other;
if (!C->getMapTypeModifiers().empty() &&
llvm::any_of(C->getMapTypeModifiers(), [](OpenMPMapModifierKind K) {
return K == OMPC_MAP_MODIFIER_present;
}))
if (llvm::is_contained(C->getMapTypeModifiers(),
OMPC_MAP_MODIFIER_present))
Kind = Present;
else if (C->getMapType() == OMPC_MAP_alloc)
Kind = Allocs;
@ -8602,10 +8600,8 @@ private:
if (!C)
continue;
MapKind Kind = Other;
if (!C->getMotionModifiers().empty() &&
llvm::any_of(C->getMotionModifiers(), [](OpenMPMotionModifierKind K) {
return K == OMPC_MOTION_MODIFIER_present;
}))
if (llvm::is_contained(C->getMotionModifiers(),
OMPC_MOTION_MODIFIER_present))
Kind = Present;
const auto *EI = C->getVarRefs().begin();
for (const auto L : C->component_lists()) {
@ -8620,10 +8616,8 @@ private:
if (!C)
continue;
MapKind Kind = Other;
if (!C->getMotionModifiers().empty() &&
llvm::any_of(C->getMotionModifiers(), [](OpenMPMotionModifierKind K) {
return K == OMPC_MOTION_MODIFIER_present;
}))
if (llvm::is_contained(C->getMotionModifiers(),
OMPC_MOTION_MODIFIER_present))
Kind = Present;
const auto *EI = C->getVarRefs().begin();
for (const auto L : C->component_lists()) {
@ -9191,18 +9185,13 @@ public:
const MapData &RHS) {
ArrayRef<OpenMPMapModifierKind> MapModifiers = std::get<2>(LHS);
OpenMPMapClauseKind MapType = std::get<1>(RHS);
bool HasPresent = !MapModifiers.empty() &&
llvm::any_of(MapModifiers, [](OpenMPMapModifierKind K) {
return K == clang::OMPC_MAP_MODIFIER_present;
});
bool HasPresent =
llvm::is_contained(MapModifiers, clang::OMPC_MAP_MODIFIER_present);
bool HasAllocs = MapType == OMPC_MAP_alloc;
MapModifiers = std::get<2>(RHS);
MapType = std::get<1>(LHS);
bool HasPresentR =
!MapModifiers.empty() &&
llvm::any_of(MapModifiers, [](OpenMPMapModifierKind K) {
return K == clang::OMPC_MAP_MODIFIER_present;
});
llvm::is_contained(MapModifiers, clang::OMPC_MAP_MODIFIER_present);
bool HasAllocsR = MapType == OMPC_MAP_alloc;
return (HasPresent && !HasPresentR) || (HasAllocs && !HasAllocsR);
});

8
clang/lib/StaticAnalyzer/Checkers/SmartPtrModeling.cpp
View File

@ -102,12 +102,8 @@ static bool hasStdClassWithName(const CXXRecordDecl *RD,
ArrayRef<llvm::StringLiteral> Names) {
if (!RD || !RD->getDeclContext()->isStdNamespace())
return false;
if (RD->getDeclName().isIdentifier()) {
StringRef Name = RD->getName();
return llvm::any_of(Names, [&Name](StringRef GivenName) -> bool {
return Name == GivenName;
});
}
if (RD->getDeclName().isIdentifier())
return llvm::is_contained(Names, RD->getName());
return false;
}