Index: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td =================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td +++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td @@ -109,6 +109,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[]'; add parentheses to treat this as a lambda-expression">; def warn_microsoft_dependent_exists : Warning< "dependent %select{__if_not_exists|__if_exists}0 declarations are ignored">, Index: cfe/trunk/lib/Parse/ParseExprCXX.cpp =================================================================== --- cfe/trunk/lib/Parse/ParseExprCXX.cpp +++ cfe/trunk/lib/Parse/ParseExprCXX.cpp @@ -3034,8 +3034,58 @@ // [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. + + 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).is(tok::r_paren) || + (GetLookAheadToken(3).is(tok::identifier) && + GetLookAheadToken(4).is(tok::identifier))))) { + TentativeParsingAction TPA(*this); + SourceLocation LSquareLoc = Tok.getLocation(); + SourceLocation RSquareLoc = NextToken().getLocation(); + + // SkipUntil can't skip pairs of ; don't emit a FixIt in this + // case. + SkipUntil({tok::l_brace, tok::less}, StopBeforeMatch); + SourceLocation RBraceLoc; + bool EmitFixIt = false; + if (TryConsumeToken(tok::l_brace)) { + SkipUntil(tok::r_brace, StopBeforeMatch); + RBraceLoc = Tok.getLocation(); + EmitFixIt = true; + } + + TPA.Revert(); + + if (EmitFixIt) + Diag(Start, diag::err_lambda_after_delete) + << SourceRange(Start, RSquareLoc) + << FixItHint::CreateInsertion(LSquareLoc, "(") + << FixItHint::CreateInsertion( + Lexer::getLocForEndOfToken( + RBraceLoc, 0, Actions.getSourceManager(), getLangOpts()), + ")"); + else + Diag(Start, diag::err_lambda_after_delete) + << SourceRange(Start, RSquareLoc); + + // Warn that the non-capturing lambda isn't surrounded by parentheses + // to disambiguate it from 'delete[]'. + ExprResult Lambda = ParseLambdaExpression(); + if (Lambda.isInvalid()) + return ExprError(); + + // Evaluate any postfix expressions used on the lambda. + Lambda = ParsePostfixExpressionSuffix(Lambda); + if (Lambda.isInvalid()) + return ExprError(); + return Actions.ActOnCXXDelete(Start, UseGlobal, /*ArrayForm=*/false, + Lambda.get()); + } + ArrayDelete = true; BalancedDelimiterTracker T(*this, tok::l_square); Index: cfe/trunk/test/FixIt/fixit-cxx0x.cpp =================================================================== --- cfe/trunk/test/FixIt/fixit-cxx0x.cpp +++ cfe/trunk/test/FixIt/fixit-cxx0x.cpp @@ -58,6 +58,9 @@ (void)[&, i, i]{ }; // expected-error{{'i' can appear only once in a capture list}} (void)[] mutable { }; // expected-error{{lambda requires '()' before 'mutable'}} (void)[] -> int { }; // expected-error{{lambda requires '()' before return type}} + + delete []() { return new int; }(); // expected-error{{'[]' after delete interpreted as 'delete[]'}} + delete [] { return new int; }(); // expected-error{{'[]' after delete interpreted as 'delete[]'}} } #define bar "bar" Index: cfe/trunk/test/Parser/cxx0x-lambda-expressions.cpp =================================================================== --- cfe/trunk/test/Parser/cxx0x-lambda-expressions.cpp +++ cfe/trunk/test/Parser/cxx0x-lambda-expressions.cpp @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -Wno-unused-value -verify -std=c++11 %s +// RUN: %clang_cc1 -fsyntax-only -Wno-unused-value -verify -std=c++2a %s enum E { e }; @@ -43,31 +44,57 @@ int a4[1] = {[&b] = 1 }; // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'const int *'}} int a5[3] = { []{return 0;}() }; int a6[1] = {[this] = 1 }; // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'C *'}} - int a7[1] = {[d(0)] { return d; } ()}; // expected-warning{{extension}} - int a8[1] = {[d = 0] { return d; } ()}; // expected-warning{{extension}} + int a7[1] = {[d(0)] { return d; } ()}; + int a8[1] = {[d = 0] { return d; } ()}; + int a10[1] = {[id(0)] { return id; } ()}; +#if __cplusplus <= 201103L + // expected-warning@-4{{extension}} + // expected-warning@-4{{extension}} + // expected-warning@-4{{extension}} +#endif int a9[1] = {[d = 0] = 1}; // expected-error{{is not an integral constant expression}} - int a10[1] = {[id(0)] { return id; } ()}; // expected-warning{{extension}} +#if __cplusplus >= 201402L + // expected-note@-2{{constant expression cannot modify an object that is visible outside that expression}} +#endif int a11[1] = {[id(0)] = 1}; } 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 + + delete []() { return new int; }(); // expected-error{{'[]' after delete interpreted as 'delete[]'}} + delete [](E Enum) { return new int((int)Enum); }(e); // expected-error{{'[]' after delete interpreted as 'delete[]'}} +#if __cplusplus > 201703L + delete []() { return new int; }(); // expected-error{{'[]' after delete interpreted as 'delete[]'}} +#endif } // We support init-captures in C++11 as an extension. int z; void init_capture() { - [n(0)] () mutable -> int { return ++n; }; // expected-warning{{extension}} - [n{0}] { return; }; // expected-warning{{extension}} - [n = 0] { return ++n; }; // expected-error {{captured by copy in a non-mutable}} expected-warning{{extension}} - [n = {0}] { return; }; // expected-error {{}} expected-warning{{extension}} - [a([&b = z]{})](){}; // expected-warning 2{{extension}} + [n(0)] () mutable -> int { return ++n; }; + [n{0}] { return; }; + [a([&b = z]{})](){}; + [n = 0] { return ++n; }; // expected-error {{captured by copy in a non-mutable}} + [n = {0}] { return; }; // expected-error {{}} +#if __cplusplus <= 201103L + // expected-warning@-6{{extension}} + // expected-warning@-6{{extension}} + // expected-warning@-6{{extension}} + // expected-warning@-7{{extension}} + // expected-warning@-7{{extension}} + // expected-warning@-7{{extension}} +#endif int x = 4; - auto y = [&r = x, x = x + 1]() -> int { // expected-warning 2{{extension}} + auto y = [&r = x, x = x + 1]() -> int { +#if __cplusplus <= 201103L + // expected-warning@-2{{extension}} + // expected-warning@-3{{extension}} +#endif r += 2; return x + 2; } (); Index: cfe/trunk/test/SemaCXX/new-delete-0x.cpp =================================================================== --- cfe/trunk/test/SemaCXX/new-delete-0x.cpp +++ cfe/trunk/test/SemaCXX/new-delete-0x.cpp @@ -34,6 +34,5 @@ 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[]'}} }