diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 3 | ||||
| -rw-r--r-- | test/SemaCXX/lambda-expressions.cpp | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 7e01b058ab..a6e43765e1 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -14926,7 +14926,8 @@ static void DoMarkVarDeclReferenced(Sema &SemaRef, SourceLocation Loc, if (RefersToEnclosingScope) { LambdaScopeInfo *const LSI = SemaRef.getCurLambda(/*IgnoreNonLambdaCapturingScope=*/true); - if (LSI && !LSI->CallOperator->Encloses(Var->getDeclContext())) { + if (LSI && (!LSI->CallOperator || + !LSI->CallOperator->Encloses(Var->getDeclContext()))) { // If a variable could potentially be odr-used, defer marking it so // until we finish analyzing the full expression for any // lvalue-to-rvalue diff --git a/test/SemaCXX/lambda-expressions.cpp b/test/SemaCXX/lambda-expressions.cpp index de77467b6d..4565345fc6 100644 --- a/test/SemaCXX/lambda-expressions.cpp +++ b/test/SemaCXX/lambda-expressions.cpp @@ -608,3 +608,18 @@ namespace ConversionOperatorDoesNotHaveDeducedReturnType { // This used to crash in return type deduction for the conversion opreator. struct A { int n; void f() { +[](decltype(n)) {}; } }; } + +namespace TypoCorrection { +template <typename T> struct X {}; +// expected-note@-1 {{template parameter is declared here}} + +template <typename T> +void Run(const int& points) { +// expected-note@-1 {{'points' declared here}} + auto outer_lambda = []() { + auto inner_lambda = [](const X<Points>&) {}; + // expected-error@-1 {{use of undeclared identifier 'Points'; did you mean 'points'?}} + // expected-error@-2 {{template argument for template type parameter must be a type}} + }; +} +} |