[CIR] Make UndefAttr use AttrBuilderWithInferredContext

[xlauko]

This mirrors incubator changes from llvm/clangir#1577

[xlauko]

• [CIR] Let ConstantOp builder infer its type automatically #136606
• [CIR] Make UndefAttr use AttrBuilderWithInferredContext #136605 👈 (View in Graphite)
• [CIR] Make ZeroAttr use AttrBuilderWithInferredContext #136604
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-clangir

Author: Henrich Lauko (xlauko)

Changes

This mirrors incubator changes from llvm/clangir#1577

---

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

2 Files Affected:

• (modified) clang/include/clang/CIR/Dialect/IR/CIRAttrs.td (+7)
• (modified) clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp (+2-2)

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
index 214db1b1caeeb..dfe15a10fa54e 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
@@ -93,6 +93,13 @@ def UndefAttr : CIR_Attr<"Undef", "undef", [TypedAttrInterface]> {
   }];
 
   let parameters = (ins AttributeSelfTypeParameter<"">:$type);
+
+  let builders = [
+    AttrBuilderWithInferredContext<(ins "mlir::Type":$type), [{
+      return $_get(type.getContext(), type);
+    }]>
+  ];
+
   let assemblyFormat = [{}];
 }
 
diff --git a/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp b/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp
index 9cd5c54e6c19e..fe8a5e7428a81 100644
--- a/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp
@@ -34,8 +34,8 @@ llvm::SmallVector<MemorySlot> cir::AllocaOp::getPromotableSlots() {
 
 Value cir::AllocaOp::getDefaultValue(const MemorySlot &slot,
                                      OpBuilder &builder) {
-  return builder.create<cir::ConstantOp>(
-      getLoc(), slot.elemType, builder.getAttr<cir::UndefAttr>(slot.elemType));
+  return builder.create<cir::ConstantOp>(getLoc(), slot.elemType,
+                                         cir::UndefAttr::get(slot.elemType));
 }
 
 void cir::AllocaOp::handleBlockArgument(const MemorySlot &slot,

[llvmbot]

@llvm/pr-subscribers-clang

Author: Henrich Lauko (xlauko)

Changes

This mirrors incubator changes from llvm/clangir#1577

---

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

2 Files Affected:

• (modified) clang/include/clang/CIR/Dialect/IR/CIRAttrs.td (+7)
• (modified) clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp (+2-2)

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
index 214db1b1caeeb..dfe15a10fa54e 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
@@ -93,6 +93,13 @@ def UndefAttr : CIR_Attr<"Undef", "undef", [TypedAttrInterface]> {
   }];
 
   let parameters = (ins AttributeSelfTypeParameter<"">:$type);
+
+  let builders = [
+    AttrBuilderWithInferredContext<(ins "mlir::Type":$type), [{
+      return $_get(type.getContext(), type);
+    }]>
+  ];
+
   let assemblyFormat = [{}];
 }
 
diff --git a/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp b/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp
index 9cd5c54e6c19e..fe8a5e7428a81 100644
--- a/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp
@@ -34,8 +34,8 @@ llvm::SmallVector<MemorySlot> cir::AllocaOp::getPromotableSlots() {
 
 Value cir::AllocaOp::getDefaultValue(const MemorySlot &slot,
                                      OpBuilder &builder) {
-  return builder.create<cir::ConstantOp>(
-      getLoc(), slot.elemType, builder.getAttr<cir::UndefAttr>(slot.elemType));
+  return builder.create<cir::ConstantOp>(getLoc(), slot.elemType,
+                                         cir::UndefAttr::get(slot.elemType));
 }
 
 void cir::AllocaOp::handleBlockArgument(const MemorySlot &slot,

[andykaylor]

lgtm

[xlauko]

Merge activity

• Apr 22, 2:26 AM EDT: A user started a stack merge that includes this pull request via Graphite.
• Apr 22, 2:47 AM EDT: Graphite couldn't merge this pull request because a downstack PR [CIR] Make ZeroAttr use AttrBuilderWithInferredContext #136604 failed to merge.
• Apr 22, 2:51 AM EDT: A user started a stack merge that includes this pull request via Graphite.
• Apr 22, 2:51 AM EDT: Graphite couldn't merge this pull request because a downstack PR [CIR] Make ZeroAttr use AttrBuilderWithInferredContext #136604 failed to merge.
• Apr 22, 3:06 AM EDT: Graphite rebased this pull request as part of a merge.
• Apr 22, 3:08 AM EDT: A user merged this pull request with Graphite.