[CIR] Recreate isScalarType as CIR_AnyScalarType constraint (llvm#1625)

Author: xlauko

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

@@ -43,6 +43,12 @@ class CIR_TypeSummaries<list<Type> types> {
     string value = !if(!eq(!size(types), 1), joined, "any of " # joined);
 }
 
+//===----------------------------------------------------------------------===//
+// Bool Type predicates
+//===----------------------------------------------------------------------===//
+
+def CIR_AnyBoolType : CIR_TypeBase<"::cir::BoolType", "boolean type">;
+
 //===----------------------------------------------------------------------===//
 // IntType predicates
 //===----------------------------------------------------------------------===//
@@ -250,4 +256,23 @@ def CIR_PtrToExceptionInfoType
       BuildableType<"$_builder.getType<" # cppType # ">("
         "cir::ExceptionInfoType::get($_builder.getContext())))">;
 
+//===----------------------------------------------------------------------===//
+// Data member type predicates
+//===----------------------------------------------------------------------===//
+
+def CIR_AnyDataMemberType : CIR_TypeBase<"::cir::DataMemberType",
+    "data member type">;
+
+//===----------------------------------------------------------------------===//
+// Scalar Type predicates
+//===----------------------------------------------------------------------===//
+
+defvar CIR_ScalarTypes = [
+    CIR_AnyBoolType, CIR_AnyIntType, CIR_AnyFloatType, CIR_AnyPtrType,
+    CIR_AnyDataMemberType
+];
+
+def CIR_AnyScalarType : AnyTypeOf<CIR_ScalarTypes, "cir scalar type"> {
+  let cppFunctionName = "isScalarType";
+}
 #endif // CLANG_CIR_DIALECT_IR_CIRTYPECONSTRAINTS_TD

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

@@ -26,8 +26,6 @@ struct RecordTypeStorage;
 } // namespace detail
 
 bool isValidFundamentalIntWidth(unsigned width);
-
-bool isScalarType(mlir::Type t);
 bool isFPOrFPVectorTy(mlir::Type);
 bool isIntOrIntVectorTy(mlir::Type);
 } // namespace cir

clang/lib/CIR/Dialect/IR/CIRTypes.cpp

@@ -758,16 +758,6 @@ LongDoubleType::getABIAlignment(const mlir::DataLayout &dataLayout,
       dataLayout, params);
 }
 
-//===----------------------------------------------------------------------===//
-// Floating-point type helpers
-//===----------------------------------------------------------------------===//
-
-bool cir::isScalarType(mlir::Type ty) {
-  return isa<cir::IntType, cir::BoolType, cir::SingleType, cir::DoubleType,
-             cir::LongDoubleType, cir::FP16Type, cir::FP128Type, cir::FP80Type,
-             cir::DataMemberType, cir::PointerType>(ty);
-}
-
 //===----------------------------------------------------------------------===//
 // Floating-point and Float-point Vector type helpers
 //===----------------------------------------------------------------------===//