[flang] Use llvm::any_of and llvm::none_of (NFC) #102797
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-semantics Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/102797.diff 4 Files Affected:
diff --git a/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp b/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp
index 7d0b8b3d7bc53d..1e44288c784c2a 100644
--- a/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp
+++ b/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp
@@ -98,9 +98,8 @@ class CallOpRewriter : public mlir::OpRewritePattern<fir::CallOp> {
assert(!builder.getNamedGlobal(globalName) &&
"We should have a unique name here");
- if (std::find_if(allocas.begin(), allocas.end(), [alloca](auto x) {
- return x.first == alloca;
- }) == allocas.end()) {
+ if (llvm::none_of(allocas,
+ [alloca](auto x) { return x.first == alloca; })) {
allocas.push_back(std::make_pair(alloca, store));
}
diff --git a/flang/lib/Semantics/data-to-inits.cpp b/flang/lib/Semantics/data-to-inits.cpp
index b6dbbbf63138ec..0f8b36de460865 100644
--- a/flang/lib/Semantics/data-to-inits.cpp
+++ b/flang/lib/Semantics/data-to-inits.cpp
@@ -522,11 +522,10 @@ static const DerivedTypeSpec *HasDefaultInitialization(const Symbol &symbol) {
} else if (!object->isDummy() && object->type()) {
if (const DerivedTypeSpec * derived{object->type()->AsDerived()}) {
DirectComponentIterator directs{*derived};
- if (std::find_if(
- directs.begin(), directs.end(), [](const Symbol &component) {
- return !IsAllocatable(component) &&
- HasDeclarationInitializer(component);
- }) != directs.end()) {
+ if (llvm::any_of(directs, [](const Symbol &component) {
+ return !IsAllocatable(component) &&
+ HasDeclarationInitializer(component);
+ })) {
return derived;
}
}
diff --git a/flang/lib/Semantics/rewrite-directives.cpp b/flang/lib/Semantics/rewrite-directives.cpp
index 2c3c87f2546a35..c94d0f3855bee3 100644
--- a/flang/lib/Semantics/rewrite-directives.cpp
+++ b/flang/lib/Semantics/rewrite-directives.cpp
@@ -88,11 +88,9 @@ bool OmpRewriteMutator::Pre(parser::OpenMPAtomicConstruct &x) {
auto findMemOrderClause =
[](const std::list<parser::OmpAtomicClause> &clauses) {
- return std::find_if(
- clauses.begin(), clauses.end(), [](const auto &clause) {
- return std::get_if<parser::OmpMemoryOrderClause>(
- &clause.u);
- }) != clauses.end();
+ return llvm::any_of(clauses, [](const auto &clause) {
+ return std::get_if<parser::OmpMemoryOrderClause>(&clause.u);
+ });
};
// Get the clause list to which the new memory order clause must be added,
diff --git a/flang/lib/Semantics/symbol.cpp b/flang/lib/Semantics/symbol.cpp
index 31e91ee7355e33..b593bf89b18bc9 100644
--- a/flang/lib/Semantics/symbol.cpp
+++ b/flang/lib/Semantics/symbol.cpp
@@ -230,11 +230,10 @@ void GenericDetails::CopyFrom(const GenericDetails &from) {
derivedType_ = from.derivedType_;
}
for (std::size_t i{0}; i < from.specificProcs_.size(); ++i) {
- if (std::find_if(specificProcs_.begin(), specificProcs_.end(),
- [&](const Symbol &mySymbol) {
- return &mySymbol.GetUltimate() ==
- &from.specificProcs_[i]->GetUltimate();
- }) == specificProcs_.end()) {
+ if (llvm::none_of(specificProcs_, [&](const Symbol &mySymbol) {
+ return &mySymbol.GetUltimate() ==
+ &from.specificProcs_[i]->GetUltimate();
+ })) {
specificProcs_.push_back(from.specificProcs_[i]);
bindingNames_.push_back(from.bindingNames_[i]);
}
|
|
@llvm/pr-subscribers-flang-fir-hlfir Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/102797.diff 4 Files Affected:
diff --git a/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp b/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp
index 7d0b8b3d7bc53d..1e44288c784c2a 100644
--- a/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp
+++ b/flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp
@@ -98,9 +98,8 @@ class CallOpRewriter : public mlir::OpRewritePattern<fir::CallOp> {
assert(!builder.getNamedGlobal(globalName) &&
"We should have a unique name here");
- if (std::find_if(allocas.begin(), allocas.end(), [alloca](auto x) {
- return x.first == alloca;
- }) == allocas.end()) {
+ if (llvm::none_of(allocas,
+ [alloca](auto x) { return x.first == alloca; })) {
allocas.push_back(std::make_pair(alloca, store));
}
diff --git a/flang/lib/Semantics/data-to-inits.cpp b/flang/lib/Semantics/data-to-inits.cpp
index b6dbbbf63138ec..0f8b36de460865 100644
--- a/flang/lib/Semantics/data-to-inits.cpp
+++ b/flang/lib/Semantics/data-to-inits.cpp
@@ -522,11 +522,10 @@ static const DerivedTypeSpec *HasDefaultInitialization(const Symbol &symbol) {
} else if (!object->isDummy() && object->type()) {
if (const DerivedTypeSpec * derived{object->type()->AsDerived()}) {
DirectComponentIterator directs{*derived};
- if (std::find_if(
- directs.begin(), directs.end(), [](const Symbol &component) {
- return !IsAllocatable(component) &&
- HasDeclarationInitializer(component);
- }) != directs.end()) {
+ if (llvm::any_of(directs, [](const Symbol &component) {
+ return !IsAllocatable(component) &&
+ HasDeclarationInitializer(component);
+ })) {
return derived;
}
}
diff --git a/flang/lib/Semantics/rewrite-directives.cpp b/flang/lib/Semantics/rewrite-directives.cpp
index 2c3c87f2546a35..c94d0f3855bee3 100644
--- a/flang/lib/Semantics/rewrite-directives.cpp
+++ b/flang/lib/Semantics/rewrite-directives.cpp
@@ -88,11 +88,9 @@ bool OmpRewriteMutator::Pre(parser::OpenMPAtomicConstruct &x) {
auto findMemOrderClause =
[](const std::list<parser::OmpAtomicClause> &clauses) {
- return std::find_if(
- clauses.begin(), clauses.end(), [](const auto &clause) {
- return std::get_if<parser::OmpMemoryOrderClause>(
- &clause.u);
- }) != clauses.end();
+ return llvm::any_of(clauses, [](const auto &clause) {
+ return std::get_if<parser::OmpMemoryOrderClause>(&clause.u);
+ });
};
// Get the clause list to which the new memory order clause must be added,
diff --git a/flang/lib/Semantics/symbol.cpp b/flang/lib/Semantics/symbol.cpp
index 31e91ee7355e33..b593bf89b18bc9 100644
--- a/flang/lib/Semantics/symbol.cpp
+++ b/flang/lib/Semantics/symbol.cpp
@@ -230,11 +230,10 @@ void GenericDetails::CopyFrom(const GenericDetails &from) {
derivedType_ = from.derivedType_;
}
for (std::size_t i{0}; i < from.specificProcs_.size(); ++i) {
- if (std::find_if(specificProcs_.begin(), specificProcs_.end(),
- [&](const Symbol &mySymbol) {
- return &mySymbol.GetUltimate() ==
- &from.specificProcs_[i]->GetUltimate();
- }) == specificProcs_.end()) {
+ if (llvm::none_of(specificProcs_, [&](const Symbol &mySymbol) {
+ return &mySymbol.GetUltimate() ==
+ &from.specificProcs_[i]->GetUltimate();
+ })) {
specificProcs_.push_back(from.specificProcs_[i]);
bindingNames_.push_back(from.bindingNames_[i]);
}
|
klausler
reviewed
Aug 17, 2024
The change avoids repeating the same container names multiple times. Your comment about the local idiom is well taken, but we can also look at it as using |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.