Allow 'static' storage specifier on an out-of-line class member template declaration...

Patch by Soumi Manna.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@360250 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 8fd6ab860a08de94a5838231dbb0963cdb2855bc..3ac5a3749d63ec13cae31e674c31712bec8d8a62 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -8673,9 +8673,12 @@ Sema::ActOnFunctionDeclarator(Scope *S, Declarator &D, DeclContext *DC,
       // member function definition.
 
       // MSVC permits the use of a 'static' storage specifier on an out-of-line
-      // member function template declaration, warn about this.
+      // member function template declaration and class member template
+      // declaration (MSVC versions before 2015), warn about this.
       Diag(D.getDeclSpec().getStorageClassSpecLoc(),
-           NewFD->getDescribedFunctionTemplate() && getLangOpts().MSVCCompat
+           ((!getLangOpts().isCompatibleWithMSVC(LangOptions::MSVC2015) &&
+             cast<CXXRecordDecl>(DC)->getDescribedClassTemplate()) ||
+           (getLangOpts().MSVCCompat && NewFD->getDescribedFunctionTemplate()))
            ? diag::ext_static_out_of_line : diag::err_static_out_of_line)
         << FixItHint::CreateRemoval(D.getDeclSpec().getStorageClassSpecLoc());
     }

diff --git a/test/SemaCXX/warn-static-outside-class-definition.cpp b/test/SemaCXX/warn-static-outside-class-definition.cpp
index 5235d35cb117a4841f62f146b0f3cbaa52d7fd92..9a3f96b7729b94645e042699e4fd17e90b5c424d 100644 (file)
--- a/test/SemaCXX/warn-static-outside-class-definition.cpp
+++ b/test/SemaCXX/warn-static-outside-class-definition.cpp
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fms-compatibility -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fms-compatibility -fsyntax-only -fms-compatibility-version=12.0 -verify %s
 
 struct C {
   template <typename T> static int foo(T);
@@ -9,3 +10,13 @@ template <typename T> static int C::foo(T) {
   return 0;
 }
 
+template <class T> struct S { 
+  void f();
+};
+
+template <class T> static void S<T>::f() {}
+#if _MSC_VER >= 1900
+  //expected-error@-2 {{'static' can only be specified inside the class definition}}
+#else
+  //expected-warning@-4 {{'static' can only be specified inside the class definition}}
+#endif