Updating based on PR feedback

Also fixed a bug thanks to @spall pointing out the missing test
coverage! Thank you!

../clang/test/SemaHLSL/Language/InitIncompleteArrays.hlsl

Author: llvm-beanz

clang/lib/Sema/SemaHLSL.cpp

@@ -3446,8 +3446,11 @@ class InitListTransformer {
     // When we're generating initializer lists for incomplete array types we
     // need to wrap around both when building the initializers and when
     // generating the final initializer lists.
-    if (Wrap)
-      InitTy = QualType(InitTy->getBaseElementTypeUnsafe(), 0);
+    if (Wrap) {
+      assert(InitTy->isIncompleteArrayType());
+      const IncompleteArrayType *IAT = Ctx.getAsIncompleteArrayType(InitTy);
+      InitTy = IAT->getElementType();
+    }
     BuildFlattenedTypeList(InitTy, DestTypes);
     DstIt = DestTypes.begin();
   }
@@ -3509,6 +3512,8 @@ bool SemaHLSL::transformInitList(const InitializedEntity &Entity,
   // rvalue-reference. When checking the initializer we should look through
   // the reference.
   QualType InitTy = Entity.getType().getNonReferenceType();
+  if (InitTy.hasAddressSpace())
+    InitTy = SemaRef.getASTContext().removeAddrSpaceQualType(InitTy);
   if (ExpectedSize != ActualSize) {
     int TooManyOrFew = ActualSize > ExpectedSize ? 1 : 0;
     SemaRef.Diag(Init->getBeginLoc(), diag::err_hlsl_incorrect_num_initializers)

clang/test/SemaHLSL/Language/InitIncompleteArrays.hlsl

@@ -11,6 +11,14 @@ struct is_same<T, T> {
   static const bool value = true;
 };
 
+template<typename T>
+struct remove_addrspace {
+  using type = __decltype((T)0);
+};
+
+template <typename T, typename V>
+using is_same_ignore_addrspace = is_same<typename remove_addrspace<T>::type, typename remove_addrspace<V>::type>;
+
 struct SomeVals {
     int2 X;
     float2 Y;
@@ -23,22 +31,26 @@ static int2 SomeArr[] = {V}; // #SomeArr
 // expected-warning@#SomeArr 2 {{implicit conversion turns floating-point number into integer: 'double' to 'int'}}
 // expected-warning@#SomeArr 2 {{implicit conversion turns floating-point number into integer: 'float' to 'int'}}
 
-_Static_assert(is_same<__decltype(SomeArr), int2[3]>::value, "What is this even?");
+_Static_assert(is_same_ignore_addrspace<__decltype(SomeArr), int2[3]>::value, "What is this even?");
 
 static int2 VecArr[] = {
     int2(0,1),
     int2(2,3),
     int4(4,5,6,7),
     };
 
-_Static_assert(is_same<__decltype(VecArr), int2[4]>::value, "One vec, two vec, three vecs, FOUR!");
+_Static_assert(is_same_ignore_addrspace<__decltype(VecArr), int2[4]>::value, "One vec, two vec, three vecs, FOUR!");
 
 static int4 V4Arr[] = {
   int2(0,1),
   int2(2,3),
 };
 
-_Static_assert(is_same<__decltype(V4Arr), int4[1]>::value, "One!");
+_Static_assert(is_same_ignore_addrspace<__decltype(V4Arr), int4[1]>::value, "One!");
+
+static int ArrOfArr[][4] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+
+_Static_assert(is_same_ignore_addrspace<__decltype(ArrOfArr), int[2][4]>::value, "Two arrays of four!");
 
 // expected-error@+1{{too few initializers in list for type 'int4[]' (aka 'vector<int, 4>[]') (expected 4 but found 2)}}
 static int4 V4ArrTooSmall[] = {
@@ -51,3 +63,6 @@ static int4 V4ArrAlsoTooSmall[] = {
   int2(2,3),
   int3(4,5,6),
 };
+
+// expected-error@+1{{too few initializers in list for type 'int[][2]' (expected 6 but found 5)}}
+static int ArrOfArrTooSmall[][2] = { 1, 2, 3, 4, 5 };