Make loplugin:defaultparams work for multiple default params per function

Change-Id: I0aa3841e1ac3375f519384f3012450bc683d1c51
This commit is contained in:
Stephan Bergmann
2015-10-20 08:43:18 +02:00
parent c4e8c39e67
commit 415d43473e

View File

@@ -32,51 +32,61 @@ bool DefaultParams::VisitCallExpr(CallExpr * callExpr) {
if (ignoreLocation(callExpr)) { if (ignoreLocation(callExpr)) {
return true; return true;
} }
if (callExpr->getNumArgs() == 0) {
return true;
}
if (callExpr->getDirectCallee() == nullptr) { if (callExpr->getDirectCallee() == nullptr) {
return true; return true;
} }
const FunctionDecl* functionDecl = callExpr->getDirectCallee()->getCanonicalDecl(); const FunctionDecl* functionDecl = callExpr->getDirectCallee()->getCanonicalDecl();
unsigned i = callExpr->getNumArgs() - 1; auto n = functionDecl->getNumParams();
Expr* arg = callExpr->getArg(i); if (n == 0 || !functionDecl->getParamDecl(n - 1)->hasDefaultArg()) {
// variadic functions
if (i >= functionDecl->getNumParams()) {
return true; return true;
} }
if (arg->isDefaultArgument()) { if(callExpr->getNumArgs()>n){
return true; report(
} DiagnosticsEngine::Warning, "TODO %0 != %1", callExpr->getLocStart())
// ignore this, it seems to trigger an infinite recursion << callExpr->getNumArgs() << n << callExpr->getSourceRange();
if (isa<UnaryExprOrTypeTraitExpr>(arg)) callExpr->dump();
return true; return true;
const ParmVarDecl* parmVarDecl = functionDecl->getParamDecl(i); }
if (!parmVarDecl->hasDefaultArg() assert(callExpr->getNumArgs() <= n); // can be < in template code
|| parmVarDecl->hasUninstantiatedDefaultArg()) for (unsigned i = callExpr->getNumArgs(); i != 0;) {
{ --i;
return true; Expr* arg = callExpr->getArg(i);
} if (arg->isDefaultArgument()) {
const Expr* defaultArgExpr = parmVarDecl->getDefaultArg(); continue;
if (defaultArgExpr &&
defaultArgExpr->getType()->isIntegralType(compiler.getASTContext()))
{
APSInt x1, x2;
if (arg->EvaluateAsInt(x1, compiler.getASTContext()) &&
defaultArgExpr->EvaluateAsInt(x2, compiler.getASTContext()) &&
x1 == x2)
{
report(
DiagnosticsEngine::Warning,
"not necessary to pass this argument, it defaults to the same value",
arg->getSourceRange().getBegin())
<< arg->getSourceRange();
/*report(
DiagnosticsEngine::Warning,
"default method parameter declaration here",
parmVarDecl->getSourceRange().getBegin())
<< parmVarDecl->getSourceRange();*/
} }
// ignore this, it seems to trigger an infinite recursion
if (isa<UnaryExprOrTypeTraitExpr>(arg))
break;
const ParmVarDecl* parmVarDecl = functionDecl->getParamDecl(i);
if (!parmVarDecl->hasDefaultArg()
|| parmVarDecl->hasUninstantiatedDefaultArg())
{
break;
}
const Expr* defaultArgExpr = parmVarDecl->getDefaultArg();
if (!(defaultArgExpr &&
defaultArgExpr->getType()->isIntegralType(
compiler.getASTContext())))
{
break;
}
APSInt x1, x2;
if (!(arg->EvaluateAsInt(x1, compiler.getASTContext()) &&
defaultArgExpr->EvaluateAsInt(x2, compiler.getASTContext()) &&
x1 == x2))
{
break;
}
report(
DiagnosticsEngine::Warning,
"not necessary to pass this argument, it defaults to the same value",
arg->getSourceRange().getBegin())
<< arg->getSourceRange();
report(
DiagnosticsEngine::Note,
"default method parameter declaration here",
parmVarDecl->getSourceRange().getBegin())
<< parmVarDecl->getSourceRange();
} }
return true; return true;
} }