namings

Author: el-ev

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

@@ -2920,7 +2920,7 @@ def ExtractMemberOp : CIR_Op<"extract_member", [Pure]> {
     ```
   }];
 
-  let arguments = (ins Struct:$record, IndexAttr:$index_attr);
+  let arguments = (ins CIRStructType:$record, IndexAttr:$index_attr);
   let results = (outs CIR_AnyType:$result);
 
   let assemblyFormat = [{
@@ -2984,9 +2984,9 @@ def InsertMemberOp : CIR_Op<"insert_member",
     ```
   }];
 
-  let arguments = (ins Struct:$record, IndexAttr:$index_attr,
+  let arguments = (ins CIRStructType:$record, IndexAttr:$index_attr,
                        CIR_AnyType:$value);
-  let results = (outs Struct:$result);
+  let results = (outs CIRStructType:$result);
 
   let builders = [
     OpBuilder<(ins "mlir::Value":$record, "uint64_t":$index,

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

@@ -757,7 +757,9 @@ def CIR_StructType : CIR_Type<"Struct", "struct",
   let hasCustomAssemblyFormat = 1;
 }
 
-def Struct : Type<CPred<"::mlir::isa<::cir::StructType>($_self)">, "CIR struct type">;
+// This type is used because of some limitations of type constraints.
+// See https://github.com/llvm/clangir/pull/1504#issuecomment-2738968751 for more details.
+def CIRStructType : Type<CPred<"::mlir::isa<::cir::StructType>($_self)">, "CIR struct type">;
 
 //===----------------------------------------------------------------------===//
 // Global type constraints