diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-12-23 02:16:45 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-12-23 02:16:45 +0000 |
| commit | 9241057266d3460392cbb7fec6ec942d3330ece3 (patch) | |
| tree | 2f22ac783aabb91eacd20b12af06e03e653a9c42 /lib/Parse/ParseTemplate.cpp | |
| parent | 712ef874534ee1bef41d1aa4664ae36148ec8b12 (diff) | |
Pass context and access to Parser::ParseExplicitInstantiation() for
good parser error recovery and for not crashing.
We still have a accepts-invalid-code bug.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147216 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseTemplate.cpp')
| -rw-r--r-- | lib/Parse/ParseTemplate.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp index 9343f5b733..4f2f49c804 100644 --- a/lib/Parse/ParseTemplate.cpp +++ b/lib/Parse/ParseTemplate.cpp @@ -31,8 +31,9 @@ Parser::ParseDeclarationStartingWithTemplate(unsigned Context, ObjCDeclContextSwitch ObjCDC(*this); if (Tok.is(tok::kw_template) && NextToken().isNot(tok::less)) { - return ParseExplicitInstantiation(SourceLocation(), ConsumeToken(), - DeclEnd); + return ParseExplicitInstantiation(Context, + SourceLocation(), ConsumeToken(), + DeclEnd, AS); } return ParseTemplateDeclarationOrSpecialization(Context, DeclEnd, AS, AccessAttrs); @@ -1107,17 +1108,19 @@ Parser::ParseTemplateArgumentList(TemplateArgList &TemplateArgs) { /// 'extern' [opt] 'template' declaration /// /// Note that the 'extern' is a GNU extension and C++0x feature. -Decl *Parser::ParseExplicitInstantiation(SourceLocation ExternLoc, +Decl *Parser::ParseExplicitInstantiation(unsigned Context, + SourceLocation ExternLoc, SourceLocation TemplateLoc, - SourceLocation &DeclEnd) { + SourceLocation &DeclEnd, + AccessSpecifier AS) { // This isn't really required here. ParsingDeclRAIIObject ParsingTemplateParams(*this); - return ParseSingleDeclarationAfterTemplate(Declarator::FileContext, + return ParseSingleDeclarationAfterTemplate(Context, ParsedTemplateInfo(ExternLoc, TemplateLoc), ParsingTemplateParams, - DeclEnd, AS_none); + DeclEnd, AS); } SourceRange Parser::ParsedTemplateInfo::getSourceRange() const { |