diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 4 | ||||
| -rw-r--r-- | lib/Parse/ParseCXXInlineMethods.cpp | 8 | ||||
| -rw-r--r-- | test/Parser/cxx-default-args.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 955f1ab1a5..dd4f1fcc57 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -271,8 +271,8 @@ def err_destructor_tilde_identifier : Error< "expected a class name after '~' to name a destructor">; def err_destructor_template_id : Error< "destructor name %0 does not refer to a template">; -def warn_default_arg_unparsed : Warning< - "parsing of default argument is incomplete">; +def err_default_arg_unparsed : Error< + "unexpected end of default argument expression">; // C++ derived classes def err_dup_virtual : Error<"duplicate 'virtual' in base specifier">; diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp index 8496ddd002..fbb8a7369d 100644 --- a/lib/Parse/ParseCXXInlineMethods.cpp +++ b/lib/Parse/ParseCXXInlineMethods.cpp @@ -145,12 +145,8 @@ void Parser::ParseLexedMethodDeclarations(ParsingClass &Class) { else { if (Tok.is(tok::cxx_defaultarg_end)) ConsumeToken(); - else { - // Warn that there are tokens from the default arg that we left - // unparsed. This actually indicates a bug in clang but we avoid - // asserting because we want the parser robust. - Diag(Tok.getLocation(), diag::warn_default_arg_unparsed); - } + else + Diag(Tok.getLocation(), diag::err_default_arg_unparsed); Actions.ActOnParamDefaultArgument(LM.DefaultArgs[I].Param, EqualLoc, move(DefArgResult)); } diff --git a/test/Parser/cxx-default-args.cpp b/test/Parser/cxx-default-args.cpp index a7bb5eeda8..7fe8474142 100644 --- a/test/Parser/cxx-default-args.cpp +++ b/test/Parser/cxx-default-args.cpp @@ -10,3 +10,7 @@ class C { typedef struct Inst { void m(int x=0); } *InstPtr; + +struct X { + void f(int x = 1:); // expected-error {{unexpected end of default argument expression}} +}; |