diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index e5ac14e092c5..e85ad03694aa 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -738,7 +738,20 @@ ActOnCompoundLiteral(SourceLocation LParenLoc, TypeTy *Ty,
   //assert((InitExpr != 0) && "ActOnCompoundLiteral(): missing expression");
   Expr *literalExpr = static_cast<Expr*>(InitExpr);
 
-  // FIXME: add more semantic analysis (C99 6.5.2.5).
+  if (literalType->isArrayType()) {
+    if (literalType->getAsVariableArrayType())
+      return Diag(LParenLoc,
+                  diag::err_variable_object_no_init,
+                  SourceRange(LParenLoc,
+                              literalExpr->getSourceRange().getEnd()));
+  } else if (literalType->isIncompleteType()) {
+    return Diag(LParenLoc,
+                diag::err_typecheck_decl_incomplete_type,
+                literalType.getAsString(),
+                SourceRange(LParenLoc,
+                            literalExpr->getSourceRange().getEnd()));
+  }
+
   if (CheckInitializerTypes(literalExpr, literalType))
     return true;
 
diff --git a/clang/test/Sema/compound-literal.c b/clang/test/Sema/compound-literal.c
index 83657245f501..3a4192260bf4 100644
--- a/clang/test/Sema/compound-literal.c
+++ b/clang/test/Sema/compound-literal.c
@@ -21,4 +21,8 @@ int main(int argc, char **argv) {
  fooFunc(&(struct foo){ 1, 2 });
 }
 
-
+struct Incomplete;
+struct Incomplete* I1 = &(struct Incomplete){1, 2, 3}; // -expected-error {{variable has incomplete type}}
+void IncompleteFunc(unsigned x) {
+  struct Incomplete* I2 = (struct foo[x]){1, 2, 3}; // -expected-error {{variable-sized object may not be initialized}}
+}