2 files changed, 21 insertions, 21 deletions

diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 6090b79c5c1..6608e120f3c 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -31,6 +31,9 @@ static Expr *IsStringInit(Expr *Init, QualType DeclType, ASTContext &Context) {
   const ArrayType *AT = Context.getAsArrayType(DeclType);
   if (!AT) return 0;
 
+  if (!isa<ConstantArrayType>(AT) && !isa<IncompleteArrayType>(AT))
+    return 0;
+
   // See if this is a string literal or @encode.
   Init = Init->IgnoreParens();
   
@@ -97,22 +100,21 @@ static void CheckStringInit(Expr *Str, QualType &DeclT, Sema &S) {
     return;
   }
   
-  if (const ConstantArrayType *CAT = dyn_cast<ConstantArrayType>(AT)) {
-    // C99 6.7.8p14. We have an array of character type with known size.
-    // However, the size may be smaller or larger than the string we are
-    // initializing.
-    // FIXME: Avoid truncation for 64-bit length strings.
-    if (StrLength-1 > CAT->getSize().getZExtValue())
-      S.Diag(Str->getSourceRange().getBegin(),
-             diag::warn_initializer_string_for_char_array_too_long)
-        << Str->getSourceRange();
-
-    // Set the type to the actual size that we are initializing.  If we have
-    // something like:
-    //   char x[1] = "foo";
-    // then this will set the string literal's type to char[1].
-    Str->setType(DeclT);
-  }
+  const ConstantArrayType *CAT = cast<ConstantArrayType>(AT);
+  
+  // C99 6.7.8p14. We have an array of character type with known size.  However,
+  // the size may be smaller or larger than the string we are initializing.
+  // FIXME: Avoid truncation for 64-bit length strings.
+  if (StrLength-1 > CAT->getSize().getZExtValue())
+    S.Diag(Str->getSourceRange().getBegin(),
+           diag::warn_initializer_string_for_char_array_too_long)
+      << Str->getSourceRange();
+  
+  // Set the type to the actual size that we are initializing.  If we have
+  // something like:
+  //   char x[1] = "foo";
+  // then this will set the string literal's type to char[1].
+  Str->setType(DeclT);
 }
 
 bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType,
@@ -670,10 +672,8 @@ void InitListChecker::CheckSubElementType(InitListExpr *IList,
       //   compatible structure or union type. In the latter case, the
       //   initial value of the object, including unnamed members, is
       //   that of the expression.
-      QualType ExprType = SemaRef.Context.getCanonicalType(expr->getType());
-      QualType ElemTypeCanon = SemaRef.Context.getCanonicalType(ElemType);
-      if (SemaRef.Context.typesAreCompatible(ExprType.getUnqualifiedType(),
-                                          ElemTypeCanon.getUnqualifiedType())) {
+      if (ElemType->isRecordType() &&
+          SemaRef.Context.hasSameUnqualifiedType(expr->getType(), ElemType)) {
         UpdateStructuredListElement(StructuredList, StructuredIndex, expr);
         ++Index;
         return;
diff --git a/clang/test/Sema/vla.c b/clang/test/Sema/vla.c
index 3e380c6d950..70ba08b7eb0 100644
--- a/clang/test/Sema/vla.c
+++ b/clang/test/Sema/vla.c
@@ -53,4 +53,4 @@ int pr2044b;
 int (*pr2044c(void))[pr2044b]; // expected-error {{variably modified type}}
 
 const int f5_ci = 1;
-void f5() { char a[][f5_ci] = {""}; }
+void f5() { char a[][f5_ci] = {""}; } // expected-error {{variable-sized object may not be initialized}}