Fix default argument comma disambiguation bug following the 'template' keyword.

llvm-svn: 214051

clang/lib/Parse/ParseCXXInlineMethods.cpp

@@ -1014,6 +1014,7 @@ bool Parser::ConsumeAndStoreInitializer(CachedTokens &Toks,
         Toks.push_back(Tok);
         ConsumeToken();
         if (Tok.is(tok::less)) {
+          ++AngleCount;
           ++KnownTemplateCount;
           Toks.push_back(Tok);
           ConsumeToken();

clang/test/Parser/cxx-ambig-init-templ.cpp

@@ -169,3 +169,9 @@ namespace ElaboratedTypeSpecifiers {
     enum E {};
   };
 }
+
+namespace PR20459 {
+  template <typename EncTraits> struct A {
+     void foo(int = EncTraits::template TypeEnc<int, int>::val); // ok
+  };
+}