2 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index d03879e907e..21fe6e1ce49 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3114,9 +3114,10 @@ static QualType TryToFixInvalidVariablyModifiedType(QualType T,
     
   assert(EvalResult.Val.isInt() && "Size expressions must be integers!");
   llvm::APSInt &Res = EvalResult.Val.getInt();
-
-  return Context.getConstantArrayType(VLATy->getElementType(),
-                                      Res, ArrayType::Normal, 0);
+  if (Res >= llvm::APSInt(Res.getBitWidth(), Res.isUnsigned()))
+    return Context.getConstantArrayType(VLATy->getElementType(),
+                                        Res, ArrayType::Normal, 0);
+  return QualType();
 }
 
 bool Sema::VerifyBitField(SourceLocation FieldLoc, IdentifierInfo *FieldName, 
diff --git a/clang/test/Sema/struct-decl.c b/clang/test/Sema/struct-decl.c
index cacd8476582..7d7961b16c8 100644
--- a/clang/test/Sema/struct-decl.c
+++ b/clang/test/Sema/struct-decl.c
@@ -7,4 +7,5 @@ struct bar {
 
 struct foo {
 	char name[(int)&((struct bar *)0)->n];
+	char name2[(int)&((struct bar *)0)->n - 1]; //expected-error{{fields must have a constant size}}
 };