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

Downgrade error "static declaration of 'foo' follows non-static declaration" to a warning in Microsoft mode. 

llvm-svn: 129985
This commit is contained in:
Francois Pichet 2011-04-22 08:14:00 +00:00
parent ae95ad1935
commit e900b10a29
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -2124,6 +2124,8 @@ def err_inline_declaration_block_scope : Error<
"inline declaration of %0 not allowed in block scope">;
def err_static_non_static : Error<
"static declaration of %0 follows non-static declaration">;
def warn_static_non_static : ExtWarn<
"static declaration of %0 follows non-static declaration">;
def err_non_static_static : Error<
"non-static declaration of %0 follows static declaration">;
def err_extern_non_extern : Error<

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

@ -1258,8 +1258,10 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD) {
New->getStorageClass() == SC_Static &&
Old->getStorageClass() != SC_Static &&
!canRedefineFunction(Old, getLangOptions())) {
Diag(New->getLocation(), diag::err_static_non_static)
<< New;
unsigned DiagID = diag::err_static_non_static;
if (getLangOptions().Microsoft)
DiagID = diag::warn_static_non_static;
Diag(New->getLocation(), DiagID) << New;
Diag(Old->getLocation(), PrevDiag);
return true;
}

12
clang/test/SemaCXX/MicrosoftExtensions.cpp
View File

@ -167,4 +167,16 @@ public:
Base3::TYPE a6; // expected-error {{missing 'typename' prior to dependent type name}}
};
}
extern void static_func();
void static_func(); // expected-note {{previous declaration is here}}
static void static_func() // expected-warning {{static declaration of 'static_func' follows non-static declaration}}
{
}