diff options
| -rw-r--r-- | clang/include/clang/Sema/Sema.h | 9 | ||||
| -rw-r--r-- | clang/lib/Parse/ParseCXXInlineMethods.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 25 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiate.cpp | 14 | ||||
| -rw-r--r-- | clang/test/SemaCXX/lambda-expressions.cpp | 13 |
5 files changed, 46 insertions, 20 deletions
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 85fb4f2cd11..3e7415e6ec9 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -968,7 +968,7 @@ public: void PushFunctionScope(); void PushBlockScope(Scope *BlockScope, BlockDecl *Block); sema::LambdaScopeInfo *PushLambdaScope(); - + /// \brief This is used to inform Sema what the current TemplateParameterDepth /// is during Parsing. Currently it is used to pass on the depth /// when parsing generic lambda 'auto' parameters. @@ -4650,8 +4650,11 @@ public: MultiTemplateParamsArg TemplateParameterLists, Expr *BitfieldWidth, const VirtSpecifiers &VS, InClassInitStyle InitStyle); - void ActOnCXXInClassMemberInitializer(Decl *VarDecl, SourceLocation EqualLoc, - Expr *Init); + + void ActOnStartCXXInClassMemberInitializer(); + void ActOnFinishCXXInClassMemberInitializer(Decl *VarDecl, + SourceLocation EqualLoc, + Expr *Init); MemInitResult ActOnMemInitializer(Decl *ConstructorD, Scope *S, diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index feff7fb724a..2fc705bc0fb 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -528,10 +528,13 @@ void Parser::ParseLexedMemberInitializer(LateParsedMemberInitializer &MI) { SourceLocation EqualLoc; + Actions.ActOnStartCXXInClassMemberInitializer(); + ExprResult Init = ParseCXXMemberInitializer(MI.Field, /*IsFunction=*/false, EqualLoc); - Actions.ActOnCXXInClassMemberInitializer(MI.Field, EqualLoc, Init.release()); + Actions.ActOnFinishCXXInClassMemberInitializer(MI.Field, EqualLoc, + Init.release()); // The next token should be our artificial terminating EOF token. if (Tok.isNot(tok::eof)) { diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index c774f25241b..608f11ceff8 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -2343,13 +2343,24 @@ namespace { } } // namespace -/// ActOnCXXInClassMemberInitializer - This is invoked after parsing an -/// in-class initializer for a non-static C++ class member, and after -/// instantiating an in-class initializer in a class template. Such actions -/// are deferred until the class is complete. -void -Sema::ActOnCXXInClassMemberInitializer(Decl *D, SourceLocation InitLoc, - Expr *InitExpr) { +/// \brief Enter a new C++ default initializer scope. After calling this, the +/// caller must call \ref ActOnFinishCXXInClassMemberInitializer, even if +/// parsing or instantiating the initializer failed. +void Sema::ActOnStartCXXInClassMemberInitializer() { + // Create a synthetic function scope to represent the call to the constructor + // that notionally surrounds a use of this initializer. + PushFunctionScope(); +} + +/// \brief This is invoked after parsing an in-class initializer for a +/// non-static C++ class member, and after instantiating an in-class initializer +/// in a class template. Such actions are deferred until the class is complete. +void Sema::ActOnFinishCXXInClassMemberInitializer(Decl *D, + SourceLocation InitLoc, + Expr *InitExpr) { + // Pop the notional constructor scope we created earlier. + PopFunctionScopeInfo(0, D); + FieldDecl *FD = cast<FieldDecl>(D); assert(FD->getInClassInitStyle() != ICIS_NoInit && "must set init style when field is created"); diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index 66203e6d5c5..2424e6fb84e 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -2134,16 +2134,14 @@ Sema::InstantiateClass(SourceLocation PointOfInstantiation, FieldDecl *NewField = FieldsWithMemberInitializers[I].second; Expr *OldInit = OldField->getInClassInitializer(); + ActOnStartCXXInClassMemberInitializer(); ExprResult NewInit = SubstInitializer(OldInit, TemplateArgs, /*CXXDirectInit=*/false); - if (NewInit.isInvalid()) - NewField->setInvalidDecl(); - else { - Expr *Init = NewInit.take(); - assert(Init && "no-argument initializer in class"); - assert(!isa<ParenListExpr>(Init) && "call-style init in class"); - ActOnCXXInClassMemberInitializer(NewField, Init->getLocStart(), Init); - } + Expr *Init = NewInit.take(); + assert((!Init || !isa<ParenListExpr>(Init)) && + "call-style init in class"); + ActOnFinishCXXInClassMemberInitializer(NewField, Init->getLocStart(), + Init); } } // Instantiate late parsed attributes, and attach them to their decls. diff --git a/clang/test/SemaCXX/lambda-expressions.cpp b/clang/test/SemaCXX/lambda-expressions.cpp index e2904247c4b..51e43216dea 100644 --- a/clang/test/SemaCXX/lambda-expressions.cpp +++ b/clang/test/SemaCXX/lambda-expressions.cpp @@ -282,4 +282,15 @@ namespace lambdas_in_NSDMIs { }; L l; } -}
\ No newline at end of file +} + +// PR18477: don't try to capture 'this' from an NSDMI encountered while parsing +// a lambda. +namespace NSDMIs_in_lambdas { + template<typename T> struct S { int a = 0; int b = a; }; + void f() { []() { S<int> s; }; } + + auto x = []{ struct S { int n, m = n; }; }; + auto y = [&]{ struct S { int n, m = n; }; }; + void g() { auto z = [&]{ struct S { int n, m = n; }; }; } +} |
