Fixes an ObjC++ parse crash caused by delayed parsing
of c-functions nested in namespace in method implementations
by turning off its delayed parsing until a proper solution is
figured out. pr13418
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160552 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 05d44a5..38aff5d 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -1340,9 +1340,12 @@
// Look at the next token to make sure that this isn't a function
// declaration. We have to check this because __attribute__ might be the
// start of a function definition in GCC-extended K&R C.
+ // FIXME. Delayed parsing not done for c/c++ functions nested in namespace
!isDeclarationAfterDeclarator() &&
(!CurParsedObjCImpl || Tok.isNot(tok::l_brace) ||
- (getLangOpts().CPlusPlus && D.getCXXScopeSpec().isSet()))) {
+ (getLangOpts().CPlusPlus &&
+ (D.getCXXScopeSpec().isSet() ||
+ !Actions.CurContext->isTranslationUnit())))) {
if (isStartOfFunctionDefinition(D)) {
if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) {
diff --git a/test/SemaObjCXX/delay-parsing-cfunctions.mm b/test/SemaObjCXX/delay-parsing-cfunctions.mm
index fbdf8ba..fa65dbe 100644
--- a/test/SemaObjCXX/delay-parsing-cfunctions.mm
+++ b/test/SemaObjCXX/delay-parsing-cfunctions.mm
@@ -41,4 +41,8 @@
X::X() = default;
void X::SortWithCollator() {}
+// pr13418
+namespace {
+ int CurrentTabId() {return 0;}
+}
@end
