forked from OSchip/llvm-project
[clang] Provide a more specific diagnostic for a misplaced lambda capture-default.
Currently a capture-default which is not the first element in the lambda-capture is diagnosed with a generic expected variable name or 'this' in lambda capture list, which is true but not very helpful. If we don't have already parsed a capture-default then a lone "&" or "=" is likely to be a misplaced capture-default, so diagnose it as such. Differential Revision: https://reviews.llvm.org/D83681 Reviewed By: aaron.ballman
This commit is contained in:
parent
cbff0c75b9
commit
32db24a7f2
|
@ -934,6 +934,8 @@ def err_lambda_capture_misplaced_ellipsis : Error<
|
||||||
"the name of the capture">;
|
"the name of the capture">;
|
||||||
def err_lambda_capture_multiple_ellipses : Error<
|
def err_lambda_capture_multiple_ellipses : Error<
|
||||||
"multiple ellipses in pack capture">;
|
"multiple ellipses in pack capture">;
|
||||||
|
def err_capture_default_first : Error<
|
||||||
|
"capture default must be first">;
|
||||||
// C++17 lambda expressions
|
// C++17 lambda expressions
|
||||||
def err_expected_star_this_capture : Error<
|
def err_expected_star_this_capture : Error<
|
||||||
"expected 'this' following '*' in lambda capture list">;
|
"expected 'this' following '*' in lambda capture list">;
|
||||||
|
|
|
@ -926,6 +926,15 @@ bool Parser::ParseLambdaIntroducer(LambdaIntroducer &Intro,
|
||||||
} else if (Tok.is(tok::kw_this)) {
|
} else if (Tok.is(tok::kw_this)) {
|
||||||
Kind = LCK_This;
|
Kind = LCK_This;
|
||||||
Loc = ConsumeToken();
|
Loc = ConsumeToken();
|
||||||
|
} else if (Tok.isOneOf(tok::amp, tok::equal) &&
|
||||||
|
NextToken().isOneOf(tok::comma, tok::r_square) &&
|
||||||
|
Intro.Default == LCD_None) {
|
||||||
|
// We have a lone "&" or "=" which is either a misplaced capture-default
|
||||||
|
// or the start of a capture (in the "&" case) with the rest of the
|
||||||
|
// capture missing. Both are an error but a misplaced capture-default
|
||||||
|
// is more likely if we don't already have a capture default.
|
||||||
|
return Invalid(
|
||||||
|
[&] { Diag(Tok.getLocation(), diag::err_capture_default_first); });
|
||||||
} else {
|
} else {
|
||||||
TryConsumeToken(tok::ellipsis, EllipsisLocs[0]);
|
TryConsumeToken(tok::ellipsis, EllipsisLocs[0]);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
// RUN: %clang_cc1 -std=c++20 -Wno-unused-value -fsyntax-only -verify %s
|
||||||
|
|
||||||
|
namespace misplaced_capture_default {
|
||||||
|
void Test() {
|
||||||
|
int i = 0;
|
||||||
|
[&, i, &] {}; // expected-error {{expected variable name or 'this' in lambda capture list}}
|
||||||
|
[&, i, = ] {}; // expected-error {{expected variable name or 'this' in lambda capture list}}
|
||||||
|
[=, &i, &] {}; // expected-error {{expected variable name or 'this' in lambda capture list}}
|
||||||
|
[=, &i, = ] {}; // expected-error {{expected variable name or 'this' in lambda capture list}}
|
||||||
|
|
||||||
|
[i, &] {}; // expected-error {{capture default must be first}}
|
||||||
|
[i, = ] {}; // expected-error {{capture default must be first}}
|
||||||
|
[i, = x] {}; // expected-error {{expected variable name or 'this' in lambda capture list}}
|
||||||
|
[=, &i] {}; // ok
|
||||||
|
[&, &i] {}; // expected-error {{'&' cannot precede a capture when the capture default is '&'}}
|
||||||
|
[&x = i] {}; // ok
|
||||||
|
[=, &x = i] {}; // ok
|
||||||
|
[x = &i] {}; // ok
|
||||||
|
[=, &x = &i] {}; // expected-error {{non-const lvalue reference to type 'int *' cannot bind to a temporary of type 'int *'}}
|
||||||
|
[&, this] {}; // expected-error {{'this' cannot be captured in this context}}
|
||||||
|
|
||||||
|
[i, &, x = 2] {}; // expected-error {{capture default must be first}}
|
||||||
|
[i, =, x = 2] {}; // expected-error {{capture default must be first}}
|
||||||
|
}
|
||||||
|
} // namespace misplaced_capture_default
|
||||||
|
|
||||||
|
namespace misplaced_capture_default_pack {
|
||||||
|
template <typename... Args> void Test(Args... args) {
|
||||||
|
[&, args...] {}; // ok
|
||||||
|
[args..., &] {}; // expected-error {{capture default must be first}}
|
||||||
|
[=, &args...] {}; // ok
|
||||||
|
[&, ... xs = &args] {}; // ok
|
||||||
|
[&, ... xs = &] {}; // expected-error {{expected expression}}
|
||||||
|
[... xs = &] {}; // expected-error {{expected expression}}
|
||||||
|
[... xs = &args, = ] {}; // expected-error {{capture default must be first}}
|
||||||
|
[... xs = &args, &] {}; // expected-error {{capture default must be first}}
|
||||||
|
}
|
||||||
|
} // namespace misplaced_capture_default_pack
|
Loading…
Reference in New Issue