maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

Patch by Soumi Manna.

llvm-svn: 360250
This commit is contained in:
Aaron Ballman 2019-05-08 13:24:36 +00:00
parent 2a647e75c5
commit 6de5576af7
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Sema/SemaDecl.cpp
View File

@ -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());
}

11
clang/test/SemaCXX/warn-static-outside-class-definition.cpp
View File

@ -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