aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/Parser.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-08-10 18:10:56 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-08-10 18:10:56 +0000
commit2eb362b50f34296c39d5ec3e5e1bd6a2c9a5877e (patch)
treef4f0e21876c7c2c414ed874cd5b7b15f6c91a9fb /lib/Parse/Parser.cpp
parent1093f4928a4263d08b44d96e468a42515d8a28f3 (diff)
objective-C++: delayed parsing of member function with
function-try-block occuring in objc's implementation block. wip. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161675 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/Parser.cpp')
-rw-r--r--lib/Parse/Parser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 3531deba4f..5f00f87af3 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -1025,7 +1025,8 @@ Decl *Parser::ParseFunctionDefinition(ParsingDeclarator &D,
}
return DP;
}
- else if (CurParsedObjCImpl && Tok.is(tok::l_brace) &&
+ else if (CurParsedObjCImpl &&
+ (Tok.is(tok::l_brace) || Tok.is(tok::kw_try)) &&
!TemplateInfo.TemplateParams &&
Actions.CurContext->isTranslationUnit()) {
MultiTemplateParamsArg TemplateParameterLists(Actions, 0, 0);