Restore patch I reversed in r138040. Known buildbot
failures are resolved.
llvm-svn: 138234
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 5bb4165..d7e7d4b 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -811,7 +811,16 @@
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