diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 0f9bd51..2bddf9e 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -651,10 +651,8 @@
     }
     T = Context.getConstantArrayType(T, ConstVal, ASM, Quals);
   }
-  // If this is not C99 or C++ with GNU extenisons, extwarn about VLA's and C99
-  // array size modifiers.
-  if (!getLangOptions().C99 && 
-      !(getLangOptions().CPlusPlus && getLangOptions().GNUMode)) {
+  // If this is not C99, extwarn about VLA's and C99 array size modifiers.
+  if (!getLangOptions().C99) {
     if (ArraySize && !ArraySize->isTypeDependent() &&
         !ArraySize->isValueDependent() &&
         !ArraySize->isIntegerConstantExpr(Context))