1 files changed, 8 insertions, 3 deletions
diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp
index 9f12ab501e..8496ddd002 100644
--- a/lib/Parse/ParseCXXInlineMethods.cpp
+++ b/lib/Parse/ParseCXXInlineMethods.cpp
@@ -143,9 +143,14 @@ void Parser::ParseLexedMethodDeclarations(ParsingClass &Class) {
         if (DefArgResult.isInvalid())
           Actions.ActOnParamDefaultArgumentError(LM.DefaultArgs[I].Param);
         else {
-          assert(Tok.is(tok::cxx_defaultarg_end) &&
-                 "We didn't parse the whole default arg!");
-          ConsumeToken(); // Consume tok::cxx_defaultarg_end.
+          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);
+          }
           Actions.ActOnParamDefaultArgument(LM.DefaultArgs[I].Param, EqualLoc,
                                             move(DefArgResult));
         }