diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-08-22 15:54:49 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-08-22 15:54:49 +0000 |
| commit | a28948f34817476d02412fa204cae038e228c827 (patch) | |
| tree | 3aab4757cbcd4cf2b320a93fec061b4f0497343a /lib/Parse/Parser.cpp | |
| parent | ec5bc81fd55bfcc26fc4bde6d5e33113d94c2209 (diff) | |
Restore patch I reversed in r138040. Known buildbot
failures are resolved.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138234 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/Parser.cpp')
| -rw-r--r-- | lib/Parse/Parser.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index 5bb4165fbb..d7e7d4b081 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -811,7 +811,16 @@ Parser::ParseDeclarationOrFunctionDefinition(ParsedAttributes &attrs, AccessSpecifier AS) { ParsingDeclSpec DS(*this); DS.takeAttributesFrom(attrs); - return ParseDeclarationOrFunctionDefinition(DS, AS); + Decl *DC = getObjCDeclContext(); + if (DC) + // Must temporarily exit the objective-c container scope for + // parsing c constructs and re-enter objc container scope + // afterwards. + Actions.ActOnObjCContainerFinishDefinition(DC); + DeclGroupPtrTy resPtrTy = ParseDeclarationOrFunctionDefinition(DS, AS); + if (DC) + Actions.ActOnObjCContainerStartDefinition(DC); + return resPtrTy; } /// ParseFunctionDefinition - We parsed and verified that the specified |