[llvm] 66008b7 - [OpenMP] Add default value for Size argument in EnumSet (#227853)

[via llvm-commits]

Author: Krzysztof Parzyszek
Date: 2026-10-01T07:00:29-05:00
New Revision: 66008b77b133f797e80c84a00dee4ac091283e22

URL: https://github.com/llvm/llvm-project/commit/66008b77b133f797e80c84a00dee4ac091283e22
DIFF: https://github.com/llvm/llvm-project/commit/66008b77b133f797e80c84a00dee4ac091283e22.diff

LOG: [OpenMP] Add default value for Size argument in EnumSet (#227853)

Most of the interesting enums cover a contiguous range of values, and
define members First_ and Last_. By subtracting the underlying values
one can get the number of elements in the enum.

Added: 
    

Modified: 
    llvm/include/llvm/Frontend/OpenMP/OMP.h
    llvm/include/llvm/Frontend/OpenMP/OMPDescriptors.h
    llvm/unittests/Frontend/EnumSetTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Frontend/OpenMP/OMP.h b/llvm/include/llvm/Frontend/OpenMP/OMP.h
index 77448b537a00c..101005fe976fd 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.h
@@ -18,6 +18,7 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Bitset.h"
 #include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/ADT/Sequence.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
@@ -73,7 +74,11 @@ template <typename Enum, size_t Size> struct EnumSetIterator {
 };
 } // namespace detail
 
-template <typename Enum, size_t Size>
+template <typename Enum>
+inline constexpr size_t EnumSize =
+    llvm::to_underlying(Enum::Last_) - llvm::to_underlying(Enum::First_) + 1;
+
+template <typename Enum, size_t Size = EnumSize<Enum>>
 struct EnumSet : public llvm::Bitset<Size> {
   using value_type = Enum;
   using Base = llvm::Bitset<Size>;
@@ -150,8 +155,8 @@ constexpr auto &EnumSetIterator<Enum, Size>::operator++() {
 }
 } // namespace detail
 
-using Clauses = EnumSet<llvm::omp::Clause, llvm::omp::Clause_enumSize>;
-using Directives = EnumSet<llvm::omp::Directive, llvm::omp::Directive_enumSize>;
+using Clauses = EnumSet<Clause>;
+using Directives = EnumSet<Directive>;
 
 LLVM_ABI ArrayRef<Directive> getLeafConstructs(Directive D);
 LLVM_ABI ArrayRef<Directive> getLeafConstructsOrSelf(Directive D);

diff  --git a/llvm/include/llvm/Frontend/OpenMP/OMPDescriptors.h b/llvm/include/llvm/Frontend/OpenMP/OMPDescriptors.h
index 1d50481bd1d6a..3adcb523f8216 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPDescriptors.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPDescriptors.h
@@ -24,20 +24,12 @@ enum class Property {
 #undef GEN_OMP_PROPERTY_ENUMS
 };
 
-static constexpr size_t Property_enumSize =
-    llvm::to_underlying(Property::Last_) -
-    llvm::to_underlying(Property::First_) + 1;
-
 enum class Modifier {
 #define GEN_OMP_MODIFIER_ENUMS
 #include "llvm/Frontend/OpenMP/OMPDescriptors.h.inc"
 #undef GEN_OMP_MODIFIER_ENUMS
 };
 
-static constexpr size_t Modifier_enumSize =
-    llvm::to_underlying(Modifier::Last_) -
-    llvm::to_underlying(Modifier::First_) + 1;
-
 enum class ModifierSet {
 #define GEN_OMP_MODIFIER_GROUP_ENUMS
 #define First_ FirstGroup_
@@ -58,19 +50,15 @@ enum class ModifierSet {
   Last_ = LastSet_,
 };
 
-static constexpr size_t ModifierSet_enumSize =
-    llvm::to_underlying(ModifierSet::Last_) -
-    llvm::to_underlying(ModifierSet::First_) + 1;
-
 constexpr inline bool isModifierGroup(ModifierSet S) {
   return //
       llvm::to_underlying(ModifierSet::FirstGroup_) <= llvm::to_underlying(S) &&
       llvm::to_underlying(S) <= llvm::to_underlying(ModifierSet::LastGroup_);
 }
 
-using Properties = EnumSet<Property, Property_enumSize>;
-using Modifiers = EnumSet<Modifier, Modifier_enumSize>;
-using ModifierSets = EnumSet<ModifierSet, ModifierSet_enumSize>;
+using Properties = EnumSet<Property>;
+using Modifiers = EnumSet<Modifier>;
+using ModifierSets = EnumSet<ModifierSet>;
 
 namespace descriptor {
 namespace details {

diff  --git a/llvm/unittests/Frontend/EnumSetTest.cpp b/llvm/unittests/Frontend/EnumSetTest.cpp
index 25d849d2839c3..ef2b80a3fcfba 100644
--- a/llvm/unittests/Frontend/EnumSetTest.cpp
+++ b/llvm/unittests/Frontend/EnumSetTest.cpp
@@ -45,7 +45,7 @@ constexpr bool ElementsAre(Range &&R) {
 }
 } // namespace detail
 
-using Clauses = EnumSet<Clause, Clause_enumSize>;
+using Clauses = EnumSet<Clause>;
 
 TEST(EnumSetTest, DefaultInitialization) {
   constexpr Clauses S;