[CIR] Refactor pointers to FuncType constraints (#1607)

Author: xlauko

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -3095,7 +3095,7 @@ def GetMethodOp : CIR_Op<"get_method"> {
   }];
 
   let arguments = (ins CIR_MethodType:$method, CIR_PtrToRecordType:$object);
-  let results = (outs FuncPtr:$callee, CIR_VoidPtrType:$adjusted_this);
+  let results = (outs CIR_PtrToFunc:$callee, CIR_VoidPtrType:$adjusted_this);
 
   let assemblyFormat = [{
     $method `,` $object

clang/include/clang/CIR/Dialect/IR/CIRTypeConstraints.td

@@ -169,6 +169,12 @@ def CIR_AnyComplexType : CIR_TypeBase<"::cir::ComplexType", "complex type">;
 
 def CIR_AnyRecordType : CIR_TypeBase<"::cir::RecordType", "record type">;
 
+//===----------------------------------------------------------------------===//
+// Function Type predicates
+//===----------------------------------------------------------------------===//
+
+def CIR_AnyFuncType : CIR_TypeBase<"::cir::FuncType", "function type">;
+
 //===----------------------------------------------------------------------===//
 // Pointer Type predicates
 //===----------------------------------------------------------------------===//
@@ -222,4 +228,6 @@ def CIR_PtrToComplexType : CIR_PtrToType<CIR_AnyComplexType>;
 
 def CIR_PtrToRecordType : CIR_PtrToType<CIR_AnyRecordType>;
 
+def CIR_PtrToFunc : CIR_PtrToType<CIR_AnyFuncType>;
+
 #endif // CLANG_CIR_DIALECT_IR_CIRTYPECONSTRAINTS_TD

clang/include/clang/CIR/Dialect/IR/CIRTypes.td

@@ -568,15 +568,6 @@ def ArrayPtr : Type<
     ]>, "!cir.ptr<!cir.array>"> {
 }
 
-// Pointer to functions
-def FuncPtr : Type<
-    And<[
-      CPred<"::mlir::isa<::cir::PointerType>($_self)">,
-      CPred<"::mlir::isa<::cir::FuncType>("
-            "::mlir::cast<::cir::PointerType>($_self).getPointee())">,
-    ]>, "!cir.ptr<!cir.func>"> {
-}
-
 //===----------------------------------------------------------------------===//
 // RecordType
 //