Address code review comments

Author: AmrDeveloper

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

@@ -307,9 +307,9 @@ def ConstComplexAttr : CIR_Attr<"ConstComplex", "const_complex",
   );
 
   let builders = [
-    AttrBuilderWithInferredContext<(ins "cir::ComplexType":$type,
-                                        "mlir::TypedAttr":$real,
+    AttrBuilderWithInferredContext<(ins "mlir::TypedAttr":$real,
                                         "mlir::TypedAttr":$imag), [{
+      auto type = cir::ComplexType::get(real.getType());
       return $_get(type.getContext(), type, real, imag);
     }]>,
   ];

clang/lib/CIR/CodeGen/CIRGenDecl.cpp

@@ -505,7 +505,7 @@ void CIRGenFunction::emitExprAsInit(const Expr *init, const ValueDecl *d,
                    "emitExprAsInit: complex type captured by init");
     mlir::Location loc = getLoc(init->getExprLoc());
     emitStoreOfComplex(loc, complex, lvalue,
-                       /*init*/ true);
+                       /*isInit*/ true);
     return;
   }
   case cir::TEK_Aggregate:

clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp

@@ -45,10 +45,11 @@ void ComplexExprEmitter::emitStoreOfComplex(mlir::Location loc, mlir::Value val,
 }
 
 mlir::Value ComplexExprEmitter::VisitInitListExpr(InitListExpr *e) {
+  mlir::Location loc = cgf.getLoc(e->getExprLoc());
   if (e->getNumInits() == 2) {
     mlir::Value real = cgf.emitScalarExpr(e->getInit(0));
     mlir::Value imag = cgf.emitScalarExpr(e->getInit(1));
-    return builder.createComplexCreate(cgf.getLoc(e->getExprLoc()), real, imag);
+    return builder.createComplexCreate(loc, real, imag);
   }
 
   if (e->getNumInits() == 1) {
@@ -57,14 +58,11 @@ mlir::Value ComplexExprEmitter::VisitInitListExpr(InitListExpr *e) {
   }
 
   assert(e->getNumInits() == 0 && "Unexpected number of inits");
-  mlir::Location loc = cgf.getLoc(e->getExprLoc());
   QualType complexElemTy =
       e->getType()->castAs<clang::ComplexType>()->getElementType();
   mlir::Type complexElemLLVMTy = cgf.convertType(complexElemTy);
   mlir::TypedAttr defaultValue = builder.getZeroInitAttr(complexElemLLVMTy);
-  auto complexTy = cir::ComplexType::get(complexElemLLVMTy);
-  auto complexAttr =
-      cir::ConstComplexAttr::get(complexTy, defaultValue, defaultValue);
+  auto complexAttr = cir::ConstComplexAttr::get(defaultValue, defaultValue);
   return builder.create<cir::ConstantOp>(loc, complexAttr);
 }
 

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

@@ -1763,8 +1763,7 @@ OpFoldResult cir::ComplexCreateOp::fold(FoldAdaptor adaptor) {
   // `#cir.const_complex` operation.
   auto realAttr = mlir::cast<mlir::TypedAttr>(real);
   auto imagAttr = mlir::cast<mlir::TypedAttr>(imag);
-  auto complexTy = cir::ComplexType::get(realAttr.getType());
-  return cir::ConstComplexAttr::get(complexTy, realAttr, imagAttr);
+  return cir::ConstComplexAttr::get(realAttr, imagAttr);
 }
 
 //===----------------------------------------------------------------------===//