[clang] [mlir] [mlir][CIR] Use DefaultValuedEnumProp for enum property defaults (NFC) (PR #240554)

Henrich Lauko via cfe-commits cfe-commits at lists.llvm.org
Tue Nov 10 00:08:54 PST 2026


https://github.com/xlauko updated https://github.com/llvm/llvm-project/pull/240554

>From 6d90ef026ab456e467bf4d3f0474ab9444aacfb4 Mon Sep 17 00:00:00 2001
From: Henrich Lauko <hlauko at nvidia.com>
Date: Mon, 9 Nov 2026 20:54:03 +0000
Subject: [PATCH 1/2] [mlir][CIR] Use DefaultValuedEnumProp for enum property
 defaults (NFC)

Switch the remaining enum properties that spell their default as a
`DefaultValuedProp<EnumProp<E>, "ns::E::Case">` string to
`DefaultValuedEnumProp<E, Case>`, which takes the case def and checks at
TableGen time that it belongs to the enum. The `none` cases of the Ptr
dialect's `PtrAddFlags`/`PtrDiffFlags` and the `Default` case of CIR's
`VisibilityKind` get named defs for this. Generated code is unchanged
apart from the default value now being spelled fully qualified.

Assisted-by: Claude Code (Claude Fable 5.1).
---
 clang/include/clang/CIR/Dialect/IR/CIRAttrs.td |  4 +++-
 clang/include/clang/CIR/Dialect/IR/CIROps.td   | 10 ++++------
 mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td   |  8 ++++++--
 mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td     |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
index 2fb7102b0ccf2c..dad5d94c6f8034 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
@@ -1584,8 +1584,10 @@ def CIR_ConstComplexAttr : CIR_ValueLikeAttr<"ConstComplex", "const_complex"> {
 // VisibilityKind
 //===----------------------------------------------------------------------===//
 
+def CIR_VisibilityDefault : I32EnumCase<"Default", 0, "default">;
+
 def CIR_VisibilityKind : CIR_I32Enum<"VisibilityKind", "C/C++ visibility", [
-  I32EnumCase<"Default", 0, "default">,
+  CIR_VisibilityDefault,
   I32EnumCase<"Hidden", 1, "hidden">,
   I32EnumCase<"Protected", 2, "protected">
 ]>;
diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td
index 93c91a48bd0c7b..2cc3eb571f45b7 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIROps.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -3519,9 +3519,8 @@ def CIR_GlobalOp : CIR_RegionBranchOpBase<"global", [
   // TODO: sym_visibility can possibly be represented by implementing the
   // necessary Symbol's interface in terms of linkage instead.
   let arguments = (ins SymbolNameAttr:$sym_name,
-                       DefaultValuedProp<
-                        EnumProp<CIR_VisibilityKind>,
-                        "cir::VisibilityKind::Default"
+                       DefaultValuedEnumProp<
+                        CIR_VisibilityKind, CIR_VisibilityDefault
                        >:$global_visibility,
                        OptionalAttr<StrAttr>:$sym_visibility,
                        TypeAttr:$sym_type,
@@ -4431,9 +4430,8 @@ def CIR_FuncOp : CIR_Op<"func", [
 
   let arguments = (ins
     SymbolNameAttr:$sym_name,
-    DefaultValuedProp<
-      EnumProp<CIR_VisibilityKind>,
-      "cir::VisibilityKind::Default"
+    DefaultValuedEnumProp<
+      CIR_VisibilityKind, CIR_VisibilityDefault
     >:$global_visibility,
     TypeAttrOf<CIR_FuncType>:$function_type,
     UnitAttr:$builtin,
diff --git a/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td b/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td
index c97bd04d328960..ee81faad438302 100644
--- a/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td
+++ b/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td
@@ -72,8 +72,10 @@ def AtomicOrderingProp : EnumProp<AtomicOrdering>;
 // Ptr add flags enum properties.
 //===----------------------------------------------------------------------===//
 
+def PtrAddFlagsNone : I32EnumCase<"none", 0>;
+
 def Ptr_PtrAddFlags : I32Enum<"PtrAddFlags", "Pointer add flags", [
-    I32EnumCase<"none", 0>, I32EnumCase<"nusw", 1>, I32EnumCase<"nuw", 2>,
+    PtrAddFlagsNone, I32EnumCase<"nusw", 1>, I32EnumCase<"nuw", 2>,
     I32EnumCase<"inbounds", 3>
   ]> {
   let cppNamespace = "::mlir::ptr";
@@ -83,8 +85,10 @@ def Ptr_PtrAddFlags : I32Enum<"PtrAddFlags", "Pointer add flags", [
 // Ptr diff flags enum properties.
 //===----------------------------------------------------------------------===//
 
+def PtrDiffFlagsNone : I8BitEnumCase<"none", 0>;
+
 def Ptr_PtrDiffFlags : I8BitEnum<"PtrDiffFlags", "Pointer difference flags", [
-    I8BitEnumCase<"none", 0>, I8BitEnumCase<"nuw", 1>, I8BitEnumCase<"nsw", 2>
+    PtrDiffFlagsNone, I8BitEnumCase<"nuw", 1>, I8BitEnumCase<"nsw", 2>
   ]> {
   let cppNamespace = "::mlir::ptr";
 }
diff --git a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
index e14f64330c2949..06c7837d61c87e 100644
--- a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
+++ b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
@@ -400,7 +400,7 @@ def Ptr_PtrAddOp : Pointer_Op<"ptr_add", [
   let arguments = (ins
     Ptr_PtrLikeType:$base,
     Ptr_IntLikeType:$offset,
-    DefaultValuedProp<EnumProp<Ptr_PtrAddFlags>, "PtrAddFlags::none">:$flags);
+    DefaultValuedEnumProp<Ptr_PtrAddFlags, PtrAddFlagsNone>:$flags);
   let results = (outs Ptr_PtrLikeType:$result);
   let assemblyFormat = [{
     ($flags^)? $base `,` $offset attr-dict `:` type($base) `,` type($offset)
@@ -457,7 +457,7 @@ def Ptr_PtrDiffOp : Pointer_Op<"ptr_diff", [
   }];
   let arguments = (ins
     Ptr_PtrLikeType:$lhs, Ptr_PtrLikeType:$rhs,
-    DefaultValuedProp<EnumProp<Ptr_PtrDiffFlags>, "PtrDiffFlags::none">:$flags
+    DefaultValuedEnumProp<Ptr_PtrDiffFlags, PtrDiffFlagsNone>:$flags
   );
   let results = (outs Ptr_IntLikeType:$result);
   let assemblyFormat = [{

>From 762c4b8c3c5ea23e7279993c526a37c0d2b67ee8 Mon Sep 17 00:00:00 2001
From: Henrich Lauko <hlauko at nvidia.com>
Date: Tue, 10 Nov 2026 08:08:40 +0000
Subject: [PATCH 2/2] Name every case of the touched enums, one per line

Assisted-by: Claude Code (Claude Fable 5.1).
---
 .../include/clang/CIR/Dialect/IR/CIRAttrs.td  |  6 ++++--
 mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td  | 19 ++++++++++++++-----
 mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td    |  4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
index dad5d94c6f8034..e8b38d46bba6e2 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
@@ -1585,11 +1585,13 @@ def CIR_ConstComplexAttr : CIR_ValueLikeAttr<"ConstComplex", "const_complex"> {
 //===----------------------------------------------------------------------===//
 
 def CIR_VisibilityDefault : I32EnumCase<"Default", 0, "default">;
+def CIR_VisibilityHidden : I32EnumCase<"Hidden", 1, "hidden">;
+def CIR_VisibilityProtected : I32EnumCase<"Protected", 2, "protected">;
 
 def CIR_VisibilityKind : CIR_I32Enum<"VisibilityKind", "C/C++ visibility", [
   CIR_VisibilityDefault,
-  I32EnumCase<"Hidden", 1, "hidden">,
-  I32EnumCase<"Protected", 2, "protected">
+  CIR_VisibilityHidden,
+  CIR_VisibilityProtected
 ]>;
 
 //===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td b/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td
index ee81faad438302..114de71a32ad2c 100644
--- a/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td
+++ b/mlir/include/mlir/Dialect/Ptr/IR/PtrEnums.td
@@ -72,11 +72,16 @@ def AtomicOrderingProp : EnumProp<AtomicOrdering>;
 // Ptr add flags enum properties.
 //===----------------------------------------------------------------------===//
 
-def PtrAddFlagsNone : I32EnumCase<"none", 0>;
+def Ptr_PtrAddFlagsNone : I32EnumCase<"none", 0>;
+def Ptr_PtrAddFlagsNusw : I32EnumCase<"nusw", 1>;
+def Ptr_PtrAddFlagsNuw : I32EnumCase<"nuw", 2>;
+def Ptr_PtrAddFlagsInbounds : I32EnumCase<"inbounds", 3>;
 
 def Ptr_PtrAddFlags : I32Enum<"PtrAddFlags", "Pointer add flags", [
-    PtrAddFlagsNone, I32EnumCase<"nusw", 1>, I32EnumCase<"nuw", 2>,
-    I32EnumCase<"inbounds", 3>
+    Ptr_PtrAddFlagsNone,
+    Ptr_PtrAddFlagsNusw,
+    Ptr_PtrAddFlagsNuw,
+    Ptr_PtrAddFlagsInbounds
   ]> {
   let cppNamespace = "::mlir::ptr";
 }
@@ -85,10 +90,14 @@ def Ptr_PtrAddFlags : I32Enum<"PtrAddFlags", "Pointer add flags", [
 // Ptr diff flags enum properties.
 //===----------------------------------------------------------------------===//
 
-def PtrDiffFlagsNone : I8BitEnumCase<"none", 0>;
+def Ptr_PtrDiffFlagsNone : I8BitEnumCase<"none", 0>;
+def Ptr_PtrDiffFlagsNuw : I8BitEnumCase<"nuw", 1>;
+def Ptr_PtrDiffFlagsNsw : I8BitEnumCase<"nsw", 2>;
 
 def Ptr_PtrDiffFlags : I8BitEnum<"PtrDiffFlags", "Pointer difference flags", [
-    PtrDiffFlagsNone, I8BitEnumCase<"nuw", 1>, I8BitEnumCase<"nsw", 2>
+    Ptr_PtrDiffFlagsNone,
+    Ptr_PtrDiffFlagsNuw,
+    Ptr_PtrDiffFlagsNsw
   ]> {
   let cppNamespace = "::mlir::ptr";
 }
diff --git a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
index 06c7837d61c87e..e5274ebe2da548 100644
--- a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
+++ b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
@@ -400,7 +400,7 @@ def Ptr_PtrAddOp : Pointer_Op<"ptr_add", [
   let arguments = (ins
     Ptr_PtrLikeType:$base,
     Ptr_IntLikeType:$offset,
-    DefaultValuedEnumProp<Ptr_PtrAddFlags, PtrAddFlagsNone>:$flags);
+    DefaultValuedEnumProp<Ptr_PtrAddFlags, Ptr_PtrAddFlagsNone>:$flags);
   let results = (outs Ptr_PtrLikeType:$result);
   let assemblyFormat = [{
     ($flags^)? $base `,` $offset attr-dict `:` type($base) `,` type($offset)
@@ -457,7 +457,7 @@ def Ptr_PtrDiffOp : Pointer_Op<"ptr_diff", [
   }];
   let arguments = (ins
     Ptr_PtrLikeType:$lhs, Ptr_PtrLikeType:$rhs,
-    DefaultValuedEnumProp<Ptr_PtrDiffFlags, PtrDiffFlagsNone>:$flags
+    DefaultValuedEnumProp<Ptr_PtrDiffFlags, Ptr_PtrDiffFlagsNone>:$flags
   );
   let results = (outs Ptr_IntLikeType:$result);
   let assemblyFormat = [{



More information about the cfe-commits mailing list