diff options
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 4 | ||||
| -rw-r--r-- | lib/Parse/Parser.cpp | 4 | ||||
| -rw-r--r-- | test/SemaObjCXX/delay-parsing-cfunctions.mm | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index a96e29556b..d91457c0d6 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -1322,7 +1322,9 @@ Parser::DeclGroupPtrTy Parser::ParseDeclGroup(ParsingDeclSpec &DS, // 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. - !isDeclarationAfterDeclarator()) { + !isDeclarationAfterDeclarator() && + (!CurParsedObjCImpl || Tok.isNot(tok::l_brace) || + (getLangOpts().CPlusPlus && D.getCXXScopeSpec().isSet()))) { if (isStartOfFunctionDefinition(D)) { if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) { diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index c2c4c90090..4cc5fdeae0 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -773,9 +773,7 @@ bool Parser::isDeclarationAfterDeclarator() { Tok.is(tok::kw_asm) || // int X() __asm__ -> not a function def Tok.is(tok::kw___attribute) || // int X() __attr__ -> not a function def (getLangOpts().CPlusPlus && - Tok.is(tok::l_paren)) || // int X(0) -> not a function def [C++] - (CurParsedObjCImpl && - Tok.is(tok::l_brace)); // C-function nested in an @implementation + Tok.is(tok::l_paren)); // int X(0) -> not a function def [C++] } /// \brief Determine whether the current token, if it occurs after a diff --git a/test/SemaObjCXX/delay-parsing-cfunctions.mm b/test/SemaObjCXX/delay-parsing-cfunctions.mm index 8e9c319a0e..fbdf8bad0a 100644 --- a/test/SemaObjCXX/delay-parsing-cfunctions.mm +++ b/test/SemaObjCXX/delay-parsing-cfunctions.mm @@ -3,6 +3,7 @@ struct X { X(); +void SortWithCollator(); }; @interface MyClass @@ -39,5 +40,5 @@ static int test() { int x{17}; X::X() = default; - +void X::SortWithCollator() {} @end |