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

Revert ValueFlow changes, there was unexpected problems in testrunner

This commit is contained in:
Daniel Marjamäki 2020-01-11 13:11:19 +01:00
parent 052eaba632
commit 6b983a9587
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cppcheck.cpp
View File

@ -247,10 +247,10 @@ unsigned int CppCheck::check(const std::string &path)
const std::string clang = Path::isCPP(path) ? "clang++" : "clang";
/* Experimental: import clang ast dump */
std::ofstream fout("__temp__.c");
std::ofstream fout("temp.c");
fout << "int x;\n";
fout.close();
const std::string cmd1 = clang + " -v -fsyntax-only __temp__.c 2>&1";
const std::string cmd1 = clang + " -v -fsyntax-only temp.c 2>&1";
const std::pair<bool, std::string> res1 = executeCommand(cmd1);
if (!res1.first) {
std::cerr << "Failed to execute '" + cmd1 + "'" << std::endl;
@ -287,7 +287,7 @@ unsigned int CppCheck::check(const std::string &path)
Tokenizer tokenizer(&mSettings, this);
tokenizer.list.appendFileIfNew(path);
clangimport::parseClangAstDump(&tokenizer, ast);
ValueFlow::setValues(&tokenizer.list, const_cast<SymbolDatabase *>(tokenizer.getSymbolDatabase()), this, &mSettings);
//ValueFlow::setValues(&tokenizer.list, const_cast<SymbolDatabase *>(tokenizer.getSymbolDatabase()), this, &mSettings);
if (mSettings.debugnormal)
tokenizer.printDebugOutput(1);

2
lib/programmemory.cpp
View File

@ -339,7 +339,7 @@ void execute(const Token *expr,
if (intValue == 0 &&
expr->str() == "--" &&
expr->astOperand1()->variable() &&
expr->astOperand1()->variable()->isUnsigned())
expr->astOperand1()->variable()->typeStartToken()->isUnsigned())
*error = true; // overflow
*result = intValue + (expr->str() == "++" ? 1 : -1);
programMemory->setIntValue(expr->astOperand1()->varId(), *result);

5
lib/symboldatabase.cpp
View File

@ -1766,11 +1766,6 @@ bool Variable::isPointerArray() const
return isArray() && nameToken() && nameToken()->previous() && (nameToken()->previous()->str() == "*");
}
bool Variable::isUnsigned() const
{
return mValueType ? (mValueType->sign == ValueType::Sign::UNSIGNED) : mTypeStartToken->isUnsigned();
}
const Token * Variable::declEndToken() const
{
Token const * declEnd = typeStartToken();

6
lib/symboldatabase.h
View File

@ -480,12 +480,6 @@ public:
return getFlag(fIsRValueRef);
}
/**
* Is variable unsigned.
* @return true only if variable _is_ unsigned. if the sign is unknown, false is returned.
*/
bool isUnsigned() const;
/**
* Does variable have a default value.
* @return true if has a default falue, false if not

4
lib/valueflow.cpp
View File

@ -1996,14 +1996,14 @@ static void valueFlowBeforeCondition(TokenList *tokenlist, SymbolDatabase *symbo
if (Token::Match(tok, "<|>")) {
if (num != 0)
continue;
if (var->isUnsigned())
if (var->valueType() && var->valueType()->sign != ValueType::Sign::UNSIGNED)
continue;
}
ValueFlow::Value val(tok, num);
val.varId = varid;
ValueFlow::Value val2;
if (num==1U && Token::Match(tok,"<=|>=")) {
if (var->isUnsigned()) {
if (var->typeStartToken()->isUnsigned()) {
val2 = ValueFlow::Value(tok,0);
val2.varId = varid;
}