Address code review comments

Author: AmrDeveloper

clang/lib/CIR/CodeGen/CIRGenBuilder.h

@@ -45,7 +45,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
     return false;
   }
 
-  // Return true if this is the null value
+  // Return true if the value is a null constant such as null pointer, (+0.0)
+  // for floating-point or zero initializer
   bool isNullValue(mlir::Attribute attr) const {
     if (mlir::isa<cir::ZeroAttr>(attr))
       return true;

clang/lib/CIR/CodeGen/CIRGenExprConstant.cpp

@@ -195,19 +195,24 @@ emitArrayConstant(CIRGenModule &cgm, mlir::Type desiredType,
     elements.resize(arrayBound, filler);
 
     if (filler.getType() != commonElementType)
-      cgm.errorNYI(
-          "array filter type should always be the same as element type");
+      commonElementType = {};
   }
 
-  SmallVector<mlir::Attribute, 4> eles;
-  eles.reserve(elements.size());
+  if (commonElementType) {
+    SmallVector<mlir::Attribute, 4> eles;
+    eles.reserve(elements.size());
 
-  for (const auto &element : elements)
-    eles.push_back(element);
+    for (const auto &element : elements)
+      eles.push_back(element);
 
-  return cir::ConstArrayAttr::get(
-      cir::ArrayType::get(builder.getContext(), commonElementType, arrayBound),
-      mlir::ArrayAttr::get(builder.getContext(), eles));
+    return cir::ConstArrayAttr::get(
+        cir::ArrayType::get(builder.getContext(), commonElementType,
+                            arrayBound),
+        mlir::ArrayAttr::get(builder.getContext(), eles));
+  }
+
+  cgm.errorNYI("array with different type elements");
+  return {};
 }
 
 //===----------------------------------------------------------------------===//
@@ -354,9 +359,7 @@ mlir::Attribute ConstantEmitter::tryEmitPrivate(const APValue &value,
       if (i == 0)
         commonElementType = elementTyped.getType();
       else if (elementTyped.getType() != commonElementType) {
-        cgm.errorNYI("ConstExprEmitter::tryEmitPrivate Array without common "
-                     "element type");
-        return {};
+        commonElementType = {};
       }
 
       elements.push_back(elementTyped);

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

@@ -259,12 +259,12 @@ mlir::Value CIRAttrToValue::visitCirAttr(cir::FPAttr fltAttr) {
 
 // ConstArrayAttr visitor
 mlir::Value CIRAttrToValue::visitCirAttr(cir::ConstArrayAttr attr) {
-  auto llvmTy = converter->convertType(attr.getType());
-  auto loc = parentOp->getLoc();
+  mlir::Type llvmTy = converter->convertType(attr.getType());
+  mlir::Location loc = parentOp->getLoc();
   mlir::Value result;
 
   if (auto zeros = attr.getTrailingZerosNum()) {
-    auto arrayTy = attr.getType();
+    mlir::Type arrayTy = attr.getType();
     result = rewriter.create<mlir::LLVM::ZeroOp>(
         loc, converter->convertType(arrayTy));
   } else {