Address code review comments

Author: AmrDeveloper

clang/lib/CIR/CodeGen/CIRGenBuilder.h

@@ -35,8 +35,12 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
   }
 
   bool isSized(mlir::Type ty) {
-    return mlir::isa<cir::PointerType, cir::ArrayType, cir::BoolType,
-                     cir::IntType>(ty);
+    if (mlir::isa<cir::PointerType, cir::ArrayType, cir::BoolType,
+                  cir::IntType>(ty))
+      return true;
+
+    assert(0 && "Unimplemented size for type");
+    return false;
   }
 };
 

clang/lib/CIR/CodeGen/CIRGenTypes.cpp

@@ -205,13 +205,6 @@ mlir::Type CIRGenTypes::convertType(QualType type) {
   case Type::ConstantArray: {
     const ConstantArrayType *arrTy = cast<ConstantArrayType>(ty);
     mlir::Type elemTy = convertTypeForMem(arrTy->getElementType());
-
-    if (!builder.isSized(elemTy)) {
-      cgm.errorNYI(SourceLocation(), "unimplemented size for type", type);
-      resultType = cir::ArrayType::get(builder.getContext(), cgm.SInt32Ty, 0);
-      break;
-    }
-
     resultType = cir::ArrayType::get(builder.getContext(), elemTy,
                                      arrTy->getSize().getZExtValue());
     break;

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

@@ -573,7 +573,8 @@ static void prepareTypeConverter(mlir::LLVMTypeConverter &converter,
     return mlir::LLVM::LLVMPointerType::get(type.getContext(), targetAS);
   });
   converter.addConversion([&](cir::ArrayType type) -> mlir::Type {
-    auto ty = convertTypeForMemory(converter, dataLayout, type.getEltType());
+    mlir::Type ty =
+        convertTypeForMemory(converter, dataLayout, type.getEltType());
     return mlir::LLVM::LLVMArrayType::get(ty, type.getSize());
   });
   converter.addConversion([&](cir::BoolType type) -> mlir::Type {

clang/test/CIR/CodeGen/array.cpp

@@ -3,14 +3,14 @@
 int a[10];
 // CHECK: cir.global external @a : !cir.array<!cir.int<s, 32> x 10>
 
-int aa[10][10];
-// CHECK: cir.global external @aa : !cir.array<!cir.array<!cir.int<s, 32> x 10> x 10>
+int aa[10][5];
+// CHECK: cir.global external @aa : !cir.array<!cir.array<!cir.int<s, 32> x 5> x 10>
 
 extern int b[10];
 // CHECK: cir.global external @b : !cir.array<!cir.int<s, 32> x 10>
 
-extern int bb[10][10];
-// CHECK: cir.global external @bb : !cir.array<!cir.array<!cir.int<s, 32> x 10> x 10>
+extern int bb[10][5];
+// CHECK: cir.global external @bb : !cir.array<!cir.array<!cir.int<s, 32> x 5> x 10>
 
 void f() {
   int l[10];
@@ -19,6 +19,8 @@ void f() {
 
 void f2(int p[10]) {}
 // CHECK: cir.func @f2(%arg0: !cir.ptr<!cir.int<s, 32>>
+// CHECK: cir.alloca !cir.ptr<!cir.int<s, 32>>, !cir.ptr<!cir.ptr<!cir.int<s, 32>>>, ["p", init]
 
-void f3(int pp[10][10]) {}
-// CHECK: cir.func @f3(%arg0: !cir.ptr<!cir.array<!cir.int<s, 32> x 10>>
+void f3(int pp[10][5]) {}
+// CHECK: cir.func @f3(%arg0: !cir.ptr<!cir.array<!cir.int<s, 32> x 5>>
+// CHECK: cir.alloca !cir.ptr<!cir.array<!cir.int<s, 32> x 5>>, !cir.ptr<!cir.ptr<!cir.array<!cir.int<s, 32> x 5>>>

clang/test/CIR/Lowering/array.cpp

@@ -3,14 +3,14 @@
 int a[10];
 // CHECK: @a = external dso_local global [10 x i32]
 
-int aa[10][10];
-// CHECK: @aa = external dso_local global [10 x [10 x i32]]
+int aa[10][5];
+// CHECK: @aa = external dso_local global [10 x [5 x i32]]
 
 extern int b[10];
 // CHECK: @b = external dso_local global [10 x i32]
 
-extern int bb[10][10];
-// CHECK: @bb = external dso_local global [10 x [10 x i32]]
+extern int bb[10][5];
+// CHECK: @bb = external dso_local global [10 x [5 x i32]]
 
 void f() {
   int l[10];
@@ -20,5 +20,5 @@ void f() {
 void f2(int p[10]) {}
 // CHECK: alloca ptr, i64 1, align 8
 
-void f3(int pp[10][10]) {}
+void f3(int pp[10][5]) {}
 // CHECK: alloca ptr, i64 1, align 8