Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some CheckUnusedFunctions usage cleanups #5976

Merged
merged 4 commits into from
Feb 12, 2024
Merged

some CheckUnusedFunctions usage cleanups #5976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29b8494
CheckUnusedFunctions: pulled some checks out of `parseTokens()` for now
firewave Jan 16, 2024
8602ed3
CppCheck: moved local `CheckUnusedFunctions` instance to `checkNormal…
firewave Jan 16, 2024
ff130b9
CppCheck: only generate `CheckUnusedFunctions` fileinfo when `unusedF…
firewave Jan 16, 2024
83e3cca
CppCheck: only invoke `CheckUnusedFunctions::check()` if `unusedFunct…
firewave Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions lib/checkunusedfunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,10 +369,7 @@ void CheckUnusedFunctions::unusedFunctionError(ErrorLogger& errorLogger,

void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Settings &settings)
{
if (!settings.checks.isEnabled(Checks::unusedFunction))
return;
if (settings.useSingleJob() && settings.buildDir.empty())
instance.parseTokens(tokenizer, tokenizer.list.getFiles().front().c_str(), settings);
instance.parseTokens(tokenizer, tokenizer.list.getFiles().front().c_str(), settings);
}

#define logChecker(id) \
Expand Down
47 changes: 29 additions & 18 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,18 +631,20 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
mPlistFile.close();
}

CheckUnusedFunctions checkUnusedFunctions;

try {
if (mSettings.library.markupFile(filename)) {
Tokenizer tokenizer(mSettings, this);
if (fileStream)
tokenizer.list.createTokens(*fileStream, filename);
else {
std::ifstream in(filename);
tokenizer.list.createTokens(in, filename);
if (mSettings.checks.isEnabled(Checks::unusedFunction) &&
mSettings.useSingleJob() &&
mSettings.buildDir.empty()) {
Tokenizer tokenizer(mSettings, this);
if (fileStream)
tokenizer.list.createTokens(*fileStream, filename);
else {
std::ifstream in(filename);
tokenizer.list.createTokens(in, filename);
}
CheckUnusedFunctions::parseTokens(tokenizer, mSettings);
}
CheckUnusedFunctions::parseTokens(tokenizer, mSettings);
return EXIT_SUCCESS;
}

Expand Down Expand Up @@ -933,10 +935,6 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
// Check normal tokens
checkNormalTokens(tokenizer);

// Analyze info..
if (!mSettings.buildDir.empty())
checkUnusedFunctions.parseTokens(tokenizer, filename.c_str(), mSettings);

#ifdef HAVE_RULES
// handling of "simple" rules has been removed.
if (hasRule("simple"))
Expand Down Expand Up @@ -1017,7 +1015,6 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
}

if (!mSettings.buildDir.empty()) {
mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", checkUnusedFunctions.analyzerInfo());
mAnalyzerInformation.close();
}

Expand Down Expand Up @@ -1072,6 +1069,8 @@ void CppCheck::checkRawTokens(const Tokenizer &tokenizer)

void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
{
CheckUnusedFunctions unusedFunctionsChecker;

// TODO: this should actually be the behavior if only "--enable=unusedFunction" is specified - see #10648
const char* unusedFunctionOnly = std::getenv("UNUSEDFUNCTION_ONLY");
const bool doUnusedFunctionOnly = unusedFunctionOnly && (std::strcmp(unusedFunctionOnly, "1") == 0);
Expand Down Expand Up @@ -1105,12 +1104,20 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
}
}

if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mSettings.buildDir.empty()) {
unusedFunctionsChecker.parseTokens(tokenizer, tokenizer.list.getFiles().front().c_str(), mSettings);
}
if (mSettings.checks.isEnabled(Checks::unusedFunction) &&
mSettings.useSingleJob() &&
mSettings.buildDir.empty()) {
CheckUnusedFunctions::parseTokens(tokenizer, mSettings);
}

if (mSettings.clang) {
// TODO: Use CTU for Clang analysis
return;
}


if (mSettings.useSingleJob() || !mSettings.buildDir.empty()) {
// Analyse the tokens..

Expand All @@ -1136,8 +1143,10 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
}
}
}
}

CheckUnusedFunctions::parseTokens(tokenizer, mSettings);
if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mSettings.buildDir.empty()) {
mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", unusedFunctionsChecker.analyzerInfo());
}

#ifdef HAVE_RULES
Expand Down Expand Up @@ -1784,7 +1793,8 @@ bool CppCheck::analyseWholeProgram()
for (Check *check : Check::instances())
errors |= check->analyseWholeProgram(&ctu, mFileInfo, mSettings, *this); // TODO: ctu

errors |= CheckUnusedFunctions::check(mSettings, *this);
if (mSettings.checks.isEnabled(Checks::unusedFunction))
errors |= CheckUnusedFunctions::check(mSettings, *this);

return errors && (mExitCode > 0);
}
Expand Down Expand Up @@ -1850,7 +1860,8 @@ void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<
for (Check *check : Check::instances())
check->analyseWholeProgram(&ctuFileInfo, fileInfoList, mSettings, *this);

CheckUnusedFunctions::check(mSettings, *this);
if (mSettings.checks.isEnabled(Checks::unusedFunction))
CheckUnusedFunctions::check(mSettings, *this);

for (Check::FileInfo *fi : fileInfoList)
delete fi;
Expand Down
Loading