Index: include/clang/Basic/DiagnosticParseKinds.td =================================================================== --- include/clang/Basic/DiagnosticParseKinds.td +++ include/clang/Basic/DiagnosticParseKinds.td @@ -99,6 +99,8 @@ InGroup, DefaultIgnore; def ext_alignof_expr : ExtWarn< "%0 applied to an expression is a GNU extension">, InGroup; +def err_lambda_after_delete : Error< + "'[]' after delete interpreted as 'delete[]'">; def warn_microsoft_dependent_exists : Warning< "dependent %select{__if_not_exists|__if_exists}0 declarations are ignored">, Index: lib/Parse/ParseExprCXX.cpp =================================================================== --- lib/Parse/ParseExprCXX.cpp +++ lib/Parse/ParseExprCXX.cpp @@ -2946,15 +2946,44 @@ // [Footnote: A lambda expression with a lambda-introducer that consists // of empty square brackets can follow the delete keyword if // the lambda expression is enclosed in parentheses.] - // FIXME: Produce a better diagnostic if the '[]' is unambiguously a - // lambda-introducer. - ArrayDelete = true; - BalancedDelimiterTracker T(*this, tok::l_square); - T.consumeOpen(); - T.consumeClose(); - if (T.getCloseLocation().isInvalid()) - return ExprError(); + const Token Next = GetLookAheadToken(2); + + // Basic lookahead to check if we have a lambda expression. + if (Next.isOneOf(tok::l_brace, tok::less) || + (Next.is(tok::l_paren) && + GetLookAheadToken(3).isOneOf(tok::r_paren, tok::identifier) && + GetLookAheadToken(4).is(tok::identifier))) { + SourceLocation RightBracketLock = NextToken().getLocation(); + // Warn if the non-capturing lambda isn't surrounded by parenthesis + // to disambiguate it from 'delete[]'. + ExprResult Lambda = ParseLambdaExpression(); + if (Lambda.isInvalid()) + return ExprError(); + + SourceLocation StartLoc = Lambda.get()->getLocStart(); + Diag(Start, diag::err_lambda_after_delete) + << SourceRange(Start, RightBracketLock) + << FixItHint::CreateInsertion(StartLoc, "(") + << FixItHint::CreateInsertion( + Lexer::getLocForEndOfToken(Lambda.get()->getLocEnd(), 1, + Actions.getSourceManager(), + getLangOpts()), + ")"); + + // Evaluate any postfix expressions used on the lambda. + Lambda = ParsePostfixExpressionSuffix(Lambda); + return Actions.ActOnCXXDelete(Start, UseGlobal, /*ArrayForm=*/false, + Lambda.get()); + } else { + ArrayDelete = true; + BalancedDelimiterTracker T(*this, tok::l_square); + + T.consumeOpen(); + T.consumeClose(); + if (T.getCloseLocation().isInvalid()) + return ExprError(); + } } ExprResult Operand(ParseCastExpression(false)); Index: test/Parser/cxx0x-lambda-expressions.cpp =================================================================== --- test/Parser/cxx0x-lambda-expressions.cpp +++ test/Parser/cxx0x-lambda-expressions.cpp @@ -53,7 +53,7 @@ void delete_lambda(int *p) { delete [] p; delete [] (int*) { new int }; // ok, compound-literal, not lambda - delete [] { return new int; } (); // expected-error{{expected expression}} + delete [] { return new int; } (); // expected-error {{'[]' after delete interpreted as 'delete[]'}} delete [&] { return new int; } (); // ok, lambda } Index: test/SemaCXX/new-delete-0x.cpp =================================================================== --- test/SemaCXX/new-delete-0x.cpp +++ test/SemaCXX/new-delete-0x.cpp @@ -34,6 +34,6 @@ void bad_deletes() { // 'delete []' is always array delete, per [expr.delete]p1. - // FIXME: Give a better diagnostic. - delete []{ return (int*)0; }(); // expected-error {{expected expression}} + delete []{ return (int*)0; }(); // expected-error {{'[]' after delete interpreted as 'delete[]'}} } +