[ADT] "Inline" TestAndEraseFromSet into SetVector::remove_if (NFC) #155790
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
TestAndEraseFromSet is used only from SetVector::remove_if. This patch "inlines" the struct into its sole user in the form of a lambda function. FWIW, "git blame" shows that TestAndEraseFromSet dates back to 2012. Most likely, the lambda function wasn't an option yet back then.
|
@llvm/pr-subscribers-llvm-adt Author: Kazu Hirata (kazutakahirata) ChangesTestAndEraseFromSet is used only from SetVector::remove_if. This FWIW, "git blame" shows that TestAndEraseFromSet dates back to 2012. Full diff: https://github.com/llvm/llvm-project/pull/155790.diff 1 Files Affected:
diff --git a/llvm/include/llvm/ADT/SetVector.h b/llvm/include/llvm/ADT/SetVector.h
index 85d4f2d5ee28a..273a011d1da1b 100644
--- a/llvm/include/llvm/ADT/SetVector.h
+++ b/llvm/include/llvm/ADT/SetVector.h
@@ -250,8 +250,13 @@ class SetVector {
if (isSmall())
return llvm::remove_if(vector_, P);
- return llvm::remove_if(vector_,
- TestAndEraseFromSet<UnaryPredicate>(P, set_));
+ return llvm::remove_if(vector_, [&](const value_type &V) {
+ if (P(V)) {
+ set_.erase(V);
+ return true;
+ }
+ return false;
+ });
}();
if (I == vector_.end())
@@ -335,29 +340,6 @@ class SetVector {
}
private:
- /// A wrapper predicate designed for use with std::remove_if.
- ///
- /// This predicate wraps a predicate suitable for use with std::remove_if to
- /// call set_.erase(x) on each element which is slated for removal.
- template <typename UnaryPredicate>
- class TestAndEraseFromSet {
- UnaryPredicate P;
- set_type &set_;
-
- public:
- TestAndEraseFromSet(UnaryPredicate P, set_type &set_)
- : P(std::move(P)), set_(set_) {}
-
- template <typename ArgumentT>
- bool operator()(const ArgumentT &Arg) {
- if (P(Arg)) {
- set_.erase(Arg);
- return true;
- }
- return false;
- }
- };
-
[[nodiscard]] static constexpr bool canBeSmall() { return N != 0; }
[[nodiscard]] bool isSmall() const { return set_.empty(); }
|
arsenm
approved these changes
Aug 28, 2025
kuhar
approved these changes
Aug 28, 2025
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.
TestAndEraseFromSet is used only from SetVector::remove_if. This
patch "inlines" the struct into its sole user in the form of a lambda
function.
FWIW, "git blame" shows that TestAndEraseFromSet dates back to 2012.
Most likely, the lambda function wasn't an option yet back then.