[CIR] Refactor VoidPtr constraint to CIR_VoidPtrType #138859

xlauko · 2025-05-07T12:41:44Z

This mirrors incubator changes from llvm/clangir#1601

xlauko · 2025-05-07T12:42:00Z

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

llvmbot · 2025-05-07T12:43:01Z

@llvm/pr-subscribers-clang

Author: Henrich Lauko (xlauko)

Changes

This mirrors incubator changes from llvm/clangir#1601

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

2 Files Affected:

(modified) clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td (+33)
(modified) clang/include/clang/CIR/Dialect/IR/CIRTypes.td (+23-15)

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td b/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td
index 10e5d15ff9fa8..00f67e2a03a25 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td
@@ -141,4 +141,37 @@ def CIR_AnyIntOrFloatType : AnyTypeOf<[CIR_AnyFloatType, CIR_AnyIntType],
     let cppFunctionName = "isAnyIntegerOrFloatingPointType";
 }
 
+//===----------------------------------------------------------------------===//
+// Pointer Type predicates
+//===----------------------------------------------------------------------===//
+
+def CIR_AnyPtrType : CIR_TypeBase<"::cir::PointerType", "pointer type">;
+
+// Pointer to type constraint bases
+class CIR_IsPtrToPred<code type> : CPred<"$_self.isPtrTo<" # type # ">()">;
+
+class CIR_PtrTo<code type, string summary>
+    : CIR_ConfinedType<CIR_AnyPtrType, [CIR_IsPtrToPred<type>],
+        "pointer to " # summary>;
+
+// Pointer to pointer constraint bases
+class CIR_IsPtrToPtrToPred<code type>
+    : CPred<"$_self.isPtrToPtrTo<" # type # ">()">;
+
+class CIR_PtrToPtrTo<code type, string summary>
+    : CIR_ConfinedType<CIR_AnyPtrType, [CIR_IsPtrToPtrToPred<type>],
+        "pointer to pointer to " # summary>;
+
+// Void pointer type constraints
+def CIR_VoidPtrType
+    : CIR_PtrTo<"::cir::VoidType", "void type">,
+      BuildableType<"$_builder.getType<" # cppType # ">("
+        "cir::VoidType::get($_builder.getContext()))">;
+
+def CIR_PtrToVoidPtrType
+    : CIR_PtrToPtrTo<"::cir::VoidType", "void type">,
+      BuildableType<"$_builder.getType<" # cppType # ">("
+        "$_builder.getType<" # cppType # ">("
+        "cir::VoidType::get($_builder.getContext())))">;
+
 #endif // CLANG_CIR_DIALECT_IR_CIRTYPECONSTRAINTS_TD
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
index 959e2cd822e76..26f1122a4b261 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
@@ -197,8 +197,30 @@ def CIR_PointerType : CIR_Type<"Pointer", "ptr",
   let skipDefaultBuilders = 1;
 
   let extraClassDeclaration = [{
+    template <typename ...Types>
+    bool isPtrTo() const {
+      return mlir::isa< Types... >(getPointee());
+    }
+
     bool isVoidPtr() const {
-      return mlir::isa<cir::VoidType>(getPointee());
+      return isPtrTo<cir::VoidType>();
+    }
+
+    template <typename ...Types>
+    bool isPtrToPtrTo() const {
+      if (auto ptrType = mlir::dyn_cast<cir::PointerType>(getPointee()))
+        return ptrType.isPtrTo<Types...>();
+      return false;
+    }
+
+    bool isPtrTo(mlir::Type type) const {
+      return getPointee() == type;
+    }
+
+    bool isPtrToPtrTo(mlir::Type type) const {
+      if (auto ptrType = mlir::dyn_cast<cir::PointerType>(getPointee()))
+        return ptrType.isPtrTo(type);
+      return false;
     }
   }];
 }
@@ -368,20 +390,6 @@ def CIR_VoidType : CIR_Type<"Void", "void"> {
   }];
 }
 
-// Constraints
-
-// Pointer to void
-def VoidPtr : Type<
-    And<[
-      CPred<"::mlir::isa<::cir::PointerType>($_self)">,
-      CPred<"::mlir::isa<::cir::VoidType>("
-            "::mlir::cast<::cir::PointerType>($_self).getPointee())">,
-    ]>, "void*">,
-    BuildableType<
-      "cir::PointerType::get($_builder.getContext(),"
-      "cir::VoidType::get($_builder.getContext()))"> {
-}
-
 //===----------------------------------------------------------------------===//
 // RecordType
 //

llvmbot · 2025-05-07T12:43:02Z

@llvm/pr-subscribers-clangir

Author: Henrich Lauko (xlauko)

Changes

This mirrors incubator changes from llvm/clangir#1601

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

2 Files Affected:

(modified) clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td (+33)
(modified) clang/include/clang/CIR/Dialect/IR/CIRTypes.td (+23-15)

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td b/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td
index 10e5d15ff9fa8..00f67e2a03a25 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td
@@ -141,4 +141,37 @@ def CIR_AnyIntOrFloatType : AnyTypeOf<[CIR_AnyFloatType, CIR_AnyIntType],
     let cppFunctionName = "isAnyIntegerOrFloatingPointType";
 }
 
+//===----------------------------------------------------------------------===//
+// Pointer Type predicates
+//===----------------------------------------------------------------------===//
+
+def CIR_AnyPtrType : CIR_TypeBase<"::cir::PointerType", "pointer type">;
+
+// Pointer to type constraint bases
+class CIR_IsPtrToPred<code type> : CPred<"$_self.isPtrTo<" # type # ">()">;
+
+class CIR_PtrTo<code type, string summary>
+    : CIR_ConfinedType<CIR_AnyPtrType, [CIR_IsPtrToPred<type>],
+        "pointer to " # summary>;
+
+// Pointer to pointer constraint bases
+class CIR_IsPtrToPtrToPred<code type>
+    : CPred<"$_self.isPtrToPtrTo<" # type # ">()">;
+
+class CIR_PtrToPtrTo<code type, string summary>
+    : CIR_ConfinedType<CIR_AnyPtrType, [CIR_IsPtrToPtrToPred<type>],
+        "pointer to pointer to " # summary>;
+
+// Void pointer type constraints
+def CIR_VoidPtrType
+    : CIR_PtrTo<"::cir::VoidType", "void type">,
+      BuildableType<"$_builder.getType<" # cppType # ">("
+        "cir::VoidType::get($_builder.getContext()))">;
+
+def CIR_PtrToVoidPtrType
+    : CIR_PtrToPtrTo<"::cir::VoidType", "void type">,
+      BuildableType<"$_builder.getType<" # cppType # ">("
+        "$_builder.getType<" # cppType # ">("
+        "cir::VoidType::get($_builder.getContext())))">;
+
 #endif // CLANG_CIR_DIALECT_IR_CIRTYPECONSTRAINTS_TD
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
index 959e2cd822e76..26f1122a4b261 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
@@ -197,8 +197,30 @@ def CIR_PointerType : CIR_Type<"Pointer", "ptr",
   let skipDefaultBuilders = 1;
 
   let extraClassDeclaration = [{
+    template <typename ...Types>
+    bool isPtrTo() const {
+      return mlir::isa< Types... >(getPointee());
+    }
+
     bool isVoidPtr() const {
-      return mlir::isa<cir::VoidType>(getPointee());
+      return isPtrTo<cir::VoidType>();
+    }
+
+    template <typename ...Types>
+    bool isPtrToPtrTo() const {
+      if (auto ptrType = mlir::dyn_cast<cir::PointerType>(getPointee()))
+        return ptrType.isPtrTo<Types...>();
+      return false;
+    }
+
+    bool isPtrTo(mlir::Type type) const {
+      return getPointee() == type;
+    }
+
+    bool isPtrToPtrTo(mlir::Type type) const {
+      if (auto ptrType = mlir::dyn_cast<cir::PointerType>(getPointee()))
+        return ptrType.isPtrTo(type);
+      return false;
     }
   }];
 }
@@ -368,20 +390,6 @@ def CIR_VoidType : CIR_Type<"Void", "void"> {
   }];
 }
 
-// Constraints
-
-// Pointer to void
-def VoidPtr : Type<
-    And<[
-      CPred<"::mlir::isa<::cir::PointerType>($_self)">,
-      CPred<"::mlir::isa<::cir::VoidType>("
-            "::mlir::cast<::cir::PointerType>($_self).getPointee())">,
-    ]>, "void*">,
-    BuildableType<
-      "cir::PointerType::get($_builder.getContext(),"
-      "cir::VoidType::get($_builder.getContext()))"> {
-}
-
 //===----------------------------------------------------------------------===//
 // RecordType
 //

erichkeane

This seems reasonable, but I'd like Andy to take a look at this before merging.

andykaylor

Looks good to me.

xlauko · 2025-05-07T17:16:44Z

Merge activity

May 7, 1:16 PM EDT: A user started a stack merge that includes this pull request via Graphite.
May 7, 1:21 PM EDT: Graphite rebased this pull request as part of a merge.
May 7, 1:23 PM EDT: @xlauko merged this pull request with Graphite.

This mirrors incubator changes from llvm/clangir#1601

xlauko mentioned this pull request May 7, 2025

[CIR] Remove inferred context from pointer type getters #138858

Merged

xlauko mentioned this pull request May 7, 2025

[CIR] Remove implicit options from tablegen files #138860

Merged

xlauko marked this pull request as ready for review May 7, 2025 12:42

xlauko requested review from lanza and bcardosolopes as code owners May 7, 2025 12:42

llvmbot added clang Clang issues not falling into any other category ClangIR Anything related to the ClangIR project labels May 7, 2025

xlauko requested review from andykaylor and erichkeane May 7, 2025 12:48

erichkeane approved these changes May 7, 2025

View reviewed changes

andykaylor approved these changes May 7, 2025

View reviewed changes

xlauko force-pushed the users/xlauko/cir-pointer-getters branch from e9b719b to f875b20 Compare May 7, 2025 17:18

Base automatically changed from users/xlauko/cir-pointer-getters to main May 7, 2025 17:21

[CIR] Refactor VoidPtr constraint to CIR_VoidPtrType

5ce38e9

This mirrors incubator changes from llvm/clangir#1601

xlauko force-pushed the users/xlauko/cir-void-pointer-constraints branch from f93f03a to 5ce38e9 Compare May 7, 2025 17:21

xlauko merged commit 5fd9098 into main May 7, 2025
6 of 9 checks passed

xlauko deleted the users/xlauko/cir-void-pointer-constraints branch May 7, 2025 17:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CIR] Refactor VoidPtr constraint to CIR_VoidPtrType #138859

[CIR] Refactor VoidPtr constraint to CIR_VoidPtrType #138859

xlauko commented May 7, 2025

xlauko commented May 7, 2025 •

edited

Loading

llvmbot commented May 7, 2025

llvmbot commented May 7, 2025

erichkeane left a comment

andykaylor left a comment

xlauko commented May 7, 2025 •

edited

Loading

[CIR] Refactor VoidPtr constraint to CIR_VoidPtrType #138859

[CIR] Refactor VoidPtr constraint to CIR_VoidPtrType #138859

Conversation

xlauko commented May 7, 2025

xlauko commented May 7, 2025 • edited Loading

llvmbot commented May 7, 2025

llvmbot commented May 7, 2025

erichkeane left a comment

Choose a reason for hiding this comment

andykaylor left a comment

Choose a reason for hiding this comment

xlauko commented May 7, 2025 • edited Loading

Merge activity

xlauko commented May 7, 2025 •

edited

Loading

xlauko commented May 7, 2025 •

edited

Loading