[FOLD]

Author: sdkrystian

clang/lib/Sema/SemaDecl.cpp

@@ -7716,6 +7716,14 @@ NamedDecl *Sema::ActOnVariableDeclarator(
                    ? diag::warn_cxx11_compat_variable_template
                    : diag::ext_variable_template);
         }
+
+        if (CurContext->isRecord() && SC != SC_Static && (IsVariableTemplate || IsPartialSpecialization)) {
+          // There is no such thing as a member field template.
+          Diag(D.getIdentifierLoc(), diag::err_template_member)
+              << II << TemplateParams->getSourceRange();
+          // Recover by pretending this is a static data member template.
+          SC = SC_Static;
+        }
       }
     } else {
       // Check that we can declare a member specialization here.

clang/lib/Sema/SemaDeclCXX.cpp

@@ -3489,9 +3489,9 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
     break;
   }
 
-  bool isInstField = ((DS.getStorageClassSpec() == DeclSpec::SCS_unspecified ||
+  bool isInstField = (DS.getStorageClassSpec() == DeclSpec::SCS_unspecified ||
                        DS.getStorageClassSpec() == DeclSpec::SCS_mutable) &&
-                      !isFunc);
+                      !isFunc && TemplateParameterLists.empty();
 
   if (DS.hasConstexprSpecifier() && isInstField) {
     SemaDiagnosticBuilder B =
@@ -3541,6 +3541,7 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
 
     IdentifierInfo *II = Name.getAsIdentifierInfo();
 
+    #if 0
     // Member field could not be with "template" keyword.
     // So TemplateParameterLists should be empty in this case.
     if (TemplateParameterLists.size()) {
@@ -3561,6 +3562,7 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
       }
       return nullptr;
     }
+    #endif
 
     if (D.getName().getKind() == UnqualifiedIdKind::IK_TemplateId) {
       Diag(D.getIdentifierLoc(), diag::err_member_with_template_arguments)