From a354f12be2fb7325345a87fd76ddbd52a5caa907 Mon Sep 17 00:00:00 2001
From: David Chisnall <csdavec@swan.ac.uk>
Date: Mon, 11 Jan 2010 23:08:08 +0000
Subject: [PATCH] Reverted r93198; done without reading relevant PR.

llvm-svn: 93205
---
 clang/lib/Sema/SemaType.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp
index 0f9bd516b490..2bddf9ecd608 100644
--- a/clang/lib/Sema/SemaType.cpp
+++ b/clang/lib/Sema/SemaType.cpp
@@ -651,10 +651,8 @@ QualType Sema::BuildArrayType(QualType T, ArrayType::ArraySizeModifier ASM,
     }
     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))