aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/Parser.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-08-10 21:15:06 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-08-10 21:15:06 +0000
commit9e5df312551bc92f0a6c908288effef2e2ed0ee7 (patch)
tree084c5bb9fd7343569a310729bf1cbe901e783477 /lib/Parse/Parser.cpp
parente790bc32ca3eb7cc396b45071d7987776e965ed7 (diff)
objective-C++: dalyed parsing of ctors with member
initializer list defined inside an objc class implementation. wip git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161699 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/Parser.cpp')
-rw-r--r--lib/Parse/Parser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 5f00f87af3..79b3daf38b 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -1026,8 +1026,9 @@ Decl *Parser::ParseFunctionDefinition(ParsingDeclarator &D,
return DP;
}
else if (CurParsedObjCImpl &&
- (Tok.is(tok::l_brace) || Tok.is(tok::kw_try)) &&
- !TemplateInfo.TemplateParams &&
+ !TemplateInfo.TemplateParams &&
+ (Tok.is(tok::l_brace) || Tok.is(tok::kw_try) ||
+ Tok.is(tok::colon)) &&
Actions.CurContext->isTranslationUnit()) {
MultiTemplateParamsArg TemplateParameterLists(Actions, 0, 0);
ParseScope BodyScope(this, Scope::FnScope|Scope::DeclScope);