walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Removed inline suppression, it was not a FP, use #ifdef differently

This commit is contained in:
Daniel Marjamäki 2020-04-28 22:29:16 +02:00
parent 13e79fdeb6
commit 3eb19a64cb
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/exprengine.cpp
View File

@ -1252,15 +1252,10 @@ static ExprEngine::ValuePtr executeAssign(const Token *tok, Data &data)
return assignValue; return assignValue;
} }
// cppcheck-suppress constParameter ; false positive
static void checkContract(Data &data, const Token *tok, const Function *function, const std::vector<ExprEngine::ValuePtr> &argValues)
{
(void)data;
(void)tok;
(void)function;
(void)argValues;
#ifdef USE_Z3 #ifdef USE_Z3
static void checkContract(Data &data, const Token *tok, const Function *function, const std::vector<ExprEngine::ValuePtr> &argValues)
{
ExprData exprData; ExprData exprData;
z3::solver solver(exprData.context); z3::solver solver(exprData.context);
try { try {
@ -1330,8 +1325,8 @@ static void checkContract(Data &data, const Token *tok, const Function *function
false); false);
data.errorLogger->reportErr(errmsg); data.errorLogger->reportErr(errmsg);
} }
#endif
} }
#endif
static ExprEngine::ValuePtr executeFunctionCall(const Token *tok, Data &data) static ExprEngine::ValuePtr executeFunctionCall(const Token *tok, Data &data)
{ {
@ -1373,7 +1368,9 @@ static ExprEngine::ValuePtr executeFunctionCall(const Token *tok, Data &data)
const std::string &functionName = tok->astOperand1()->function()->fullName(); const std::string &functionName = tok->astOperand1()->function()->fullName();
const auto contractIt = data.settings->functionContracts.find(functionName); const auto contractIt = data.settings->functionContracts.find(functionName);
if (contractIt != data.settings->functionContracts.end()) { if (contractIt != data.settings->functionContracts.end()) {
#ifdef USE_Z3
checkContract(data, tok, tok->astOperand1()->function(), argValues); checkContract(data, tok, tok->astOperand1()->function(), argValues);
#endif
} else if (!argValues.empty()) { } else if (!argValues.empty()) {
bool bailout = false; bool bailout = false;
for (const auto v: argValues) for (const auto v: argValues)