Skip to content

Conversation

joker-eph
Copy link
Collaborator

This reverts commit 9b493dc.

There are hundreds of warnings when building LLVM/Clang because of this right now. See the original PR for the detailed issues.

Also revert the follow-up fix "[ADT] Fix redirection of SmallSet to SmallPtrSet (#155117)" This reverts commit 3ca1ca4.

@llvmbot
Copy link
Member

llvmbot commented Aug 27, 2025

@llvm/pr-subscribers-llvm-adt

Author: Mehdi Amini (joker-eph)

Changes

This reverts commit 9b493dc.

There are hundreds of warnings when building LLVM/Clang because of this right now. See the original PR for the detailed issues.

Also revert the follow-up fix "[ADT] Fix redirection of SmallSet to SmallPtrSet (#155117)" This reverts commit 3ca1ca4.


Full diff: https://github.com/llvm/llvm-project/pull/155622.diff

1 Files Affected:

  • (modified) llvm/include/llvm/ADT/SmallSet.h (+1-10)
diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
index 4c60b15224a45..eb434bcb71717 100644
--- a/llvm/include/llvm/ADT/SmallSet.h
+++ b/llvm/include/llvm/ADT/SmallSet.h
@@ -268,17 +268,8 @@ class SmallSet {
 
 /// If this set is of pointer values, transparently switch over to using
 /// SmallPtrSet for performance.
-///
-/// We use this middleman class DeprecatedSmallSet so that the deprecation
-/// warning works.  Placing LLVM_DEPRECATED just before SmallSet below won't
-/// work.
-template <typename PointerType, unsigned N>
-class LLVM_DEPRECATED("Use SmallPtrSet instead", "SmallPtrSet")
-    DeprecatedSmallSet : public SmallPtrSet<PointerType, N> {};
-
 template <typename PointeeType, unsigned N>
-class SmallSet<PointeeType *, N> : public DeprecatedSmallSet<PointeeType *, N> {
-};
+class SmallSet<PointeeType*, N> : public SmallPtrSet<PointeeType*, N> {};
 
 /// Equality comparison for SmallSet.
 ///

Copy link

github-actions bot commented Aug 27, 2025

✅ With the latest revision this PR passed the C/C++ code formatter.

Copy link
Contributor

@nikic nikic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@kazutakahirata kazutakahirata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for taking care of this!

…(Take 2) (llvm#155078)"

This reverts commit 9b493dc.

There are hundreds of warnings when building LLVM/Clang because of this right now.
See the original PR for the detailed issues.

Also revert the follow-up fix "[ADT] Fix redirection of SmallSet to SmallPtrSet (llvm#155117)"
This reverts commit 3ca1ca4.
@joker-eph joker-eph enabled auto-merge (squash) August 27, 2025 14:34
@joker-eph joker-eph merged commit 7f11850 into llvm:main Aug 27, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants