Follow-up to r214408: Warn on other callee-cleanup functions without prototype too.
According to lore, we used to verifier-fail on:
void __thiscall f();
int main() { f(1); }
So that's fixed now. System headers use prototype-less __stdcall functions,
so make that a warning that's DefaultError -- then it fires on regular code
but is suppressed in system headers.
Since it's used in system headers, we have codegen tests for this; massage
them slightly so that they still compile.
llvm-svn: 218166
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 0aaa60c..535e33a 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -7937,15 +7937,19 @@
// Semantic checking for this function declaration (in isolation).
- // Diagnose the use of X86 fastcall on unprototyped functions.
+ // Diagnose the use of callee-cleanup calls on unprototyped functions.
QualType NewQType = Context.getCanonicalType(NewFD->getType());
const FunctionType *NewType = cast<FunctionType>(NewQType);
if (isa<FunctionNoProtoType>(NewType)) {
FunctionType::ExtInfo NewTypeInfo = NewType->getExtInfo();
- if (NewTypeInfo.getCC() == CC_X86FastCall)
- Diag(NewFD->getLocation(), diag::err_cconv_knr)
- << FunctionType::getNameForCallConv(CC_X86FastCall);
- // TODO: Also diagnose unprototyped stdcall functions?
+ if (isCalleeCleanup(NewTypeInfo.getCC())) {
+ // Windows system headers sometimes accidentally use stdcall without
+ // (void) parameters, so use a default-error warning in this case :-/
+ int DiagID = NewTypeInfo.getCC() == CC_X86StdCall
+ ? diag::warn_cconv_knr : diag::err_cconv_knr;
+ Diag(NewFD->getLocation(), DiagID)
+ << FunctionType::getNameForCallConv(NewTypeInfo.getCC());
+ }
}
if (getLangOpts().CPlusPlus) {