diff options
| -rw-r--r-- | lib/Parse/ParseCXXInlineMethods.cpp | 5 | ||||
| -rw-r--r-- | test/Parser/cxx-default-delete.cpp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp index 65f7f56fe9..2877628f26 100644 --- a/lib/Parse/ParseCXXInlineMethods.cpp +++ b/lib/Parse/ParseCXXInlineMethods.cpp @@ -66,6 +66,11 @@ Decl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, if (Tok.is(tok::equal)) { ConsumeToken(); + if (!FnD) { + SkipUntil(tok::semi); + return 0; + } + bool Delete = false; SourceLocation KWLoc; if (Tok.is(tok::kw_delete)) { diff --git a/test/Parser/cxx-default-delete.cpp b/test/Parser/cxx-default-delete.cpp index f34f6fb014..9ace0acee8 100644 --- a/test/Parser/cxx-default-delete.cpp +++ b/test/Parser/cxx-default-delete.cpp @@ -13,3 +13,7 @@ struct foo { }; void baz() = delete; + +struct quux { + int quux() = default; // expected-error{{constructor cannot have a return type}} expected-error {{member 'quux' has the same name as its class}} +}; |