From c6bb0e117f98dc7ecb72cbb6430742f85d5d60d2 Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@mac.com>
Date: Mon, 3 May 2010 15:45:23 +0000
Subject: The array form of 'new' can never have initializers.

llvm-svn: 102917
---
 clang/lib/Sema/SemaExprCXX.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'clang/lib/Sema/SemaExprCXX.cpp')

diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index e6b3c4e3a04..425fc2d15aa 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -738,6 +738,15 @@ Sema::BuildCXXNew(SourceLocation StartLoc, bool UseGlobal,
   unsigned NumConsArgs = ConstructorArgs.size();
   ASTOwningVector<&ActionBase::DeleteExpr> ConvertedConstructorArgs(*this);
 
+  // Array 'new' can't have any initializers.
+  if (NumConsArgs && ArraySize) {
+    SourceRange InitRange(ConsArgs[0]->getLocStart(),
+                          ConsArgs[NumConsArgs - 1]->getLocEnd());
+    
+    Diag(StartLoc, diag::err_new_array_init_args) << InitRange;
+    return ExprError();
+  }
+
   if (!AllocType->isDependentType() &&
       !Expr::hasAnyTypeDependentArguments(ConsArgs, NumConsArgs)) {
     // C++0x [expr.new]p15:
-- 
cgit v1.2.3