commit 043cad21b78c6b02597cdc7b6ead32388e27ebc7
author Douglas Gregor <dgregor@apple.com> Fri Sep 11 00:18:58 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Sep 11 00:18:58 2009 +0000
tree ad0022b00750e4610ff168ab898cdb6fa1c4903a
parent 8b26cbd4e4c01cb7a06ec2f794f2fce3b58cf4d0

Diagnose VLAs as an error in C++.

Also, treat the GNU __null as an integral constant expression to match
GCC's behavior.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81490 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaType.cpp

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index c4064e1..9f95198 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -593,9 +593,11 @@
     if (ArraySize && !ArraySize->isTypeDependent() &&
         !ArraySize->isValueDependent() &&
         !ArraySize->isIntegerConstantExpr(Context))
-      Diag(Loc, diag::ext_vla);
+      Diag(Loc, getLangOptions().CPlusPlus? diag::err_vla_cxx : diag::ext_vla);
     else if (ASM != ArrayType::Normal || Quals != 0)
-      Diag(Loc, diag::ext_c99_array_usage);
+      Diag(Loc, 
+           getLangOptions().CPlusPlus? diag::err_c99_array_usage_cxx
+                                     : diag::ext_c99_array_usage);
   }
 
   return T;