Revert "[ADT] Deprecate the redirection from SmallSet to SmallPtrSet" #155075
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
|
@llvm/pr-subscribers-llvm-adt Author: Jordan Rupprecht (rupprecht) ChangesReverts llvm/llvm-project#154891 The added constructors changes the semantics of other implicitly defined constructors, which causes downstream breakages. Full diff: https://github.com/llvm/llvm-project/pull/155075.diff 1 Files Affected:
diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
index 802a257aaf6ad..eb434bcb71717 100644
--- a/llvm/include/llvm/ADT/SmallSet.h
+++ b/llvm/include/llvm/ADT/SmallSet.h
@@ -269,28 +269,7 @@ class SmallSet {
/// If this set is of pointer values, transparently switch over to using
/// SmallPtrSet for performance.
template <typename PointeeType, unsigned N>
-class SmallSet<PointeeType *, N> : public SmallPtrSet<PointeeType *, N> {
- using Base = SmallPtrSet<PointeeType *, N>;
-
-public:
- // LLVM_DEPRECATED placed between "template" and "class" above won't work for
- // some reason. Put a deprecation message on constructors instead.
- LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
- SmallSet() = default;
- LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
- SmallSet(const SmallSet &) = default;
- LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
- SmallSet(SmallSet &&) = default;
- template <typename IterT>
- LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
- SmallSet(IterT Begin, IterT End) : Base(Begin, End) {}
- template <typename Range>
- LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
- SmallSet(llvm::from_range_t, Range &&R)
- : Base(llvm::from_range, std::move(R)) {}
- LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
- SmallSet(std::initializer_list<PointeeType *> L) : Base(L) {}
-};
+class SmallSet<PointeeType*, N> : public SmallPtrSet<PointeeType*, N> {};
/// Equality comparison for SmallSet.
///
|
kazutakahirata
approved these changes
Aug 23, 2025
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions h -- llvm/include/llvm/ADT/SmallSet.hView the diff from clang-format here.diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
index eb434bcb7..7d8c32875 100644
--- a/llvm/include/llvm/ADT/SmallSet.h
+++ b/llvm/include/llvm/ADT/SmallSet.h
@@ -269,7 +269,7 @@ private:
/// If this set is of pointer values, transparently switch over to using
/// SmallPtrSet for performance.
template <typename PointeeType, unsigned N>
-class SmallSet<PointeeType*, N> : public SmallPtrSet<PointeeType*, N> {};
+class SmallSet<PointeeType *, N> : public SmallPtrSet<PointeeType *, N> {};
/// Equality comparison for SmallSet.
///
|
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.
Reverts #154891
The added constructors changes the semantics of other implicitly defined constructors, which causes downstream breakages.