Skip to content

Commit 1a8fa79

Browse files
firewavefirewave
committed
stop pretending CheckUnusedFunctions is a real Check 
1 parent f21db81 commit 1a8fa79

4 files changed

Lines changed: 49 additions & 75 deletions

File tree

‎lib/checkunusedfunctions.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "checkunusedfunctions.h"
2222

2323
#include "astutils.h"
24+
#include "check.h"
2425
#include "errorlogger.h"
2526
#include "errortypes.h"
2627
#include "library.h"
@@ -380,8 +381,9 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer *tokenizer, const Setting
380381

381382
bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger &errorLogger)
382383
{
383-
CheckUnusedFunctions dummy(nullptr, &settings, &errorLogger);
384-
dummy.logChecker("CheckUnusedFunctions::analyseWholeProgram");
384+
// TODO
385+
//CheckUnusedFunctions dummy(nullptr, &settings, &errorLogger);
386+
//dummy.logChecker("CheckUnusedFunctions::analyseWholeProgram");
385387
return instance.check(&errorLogger, settings);
386388
}
387389

@@ -412,7 +414,7 @@ namespace {
412414
};
413415
}
414416

415-
void CheckUnusedFunctions::analyseWholeProgram2(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir)
417+
void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir)
416418
{
417419
std::map<std::string, Location> decls;
418420
std::set<std::string> calls;

‎lib/checkunusedfunctions.h‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#define checkunusedfunctionsH
2323
//---------------------------------------------------------------------------
2424

25-
#include "check.h"
2625
#include "config.h"
2726

2827
#include <list>
@@ -35,28 +34,18 @@ class Function;
3534
class Settings;
3635
class Tokenizer;
3736

38-
namespace CTU {
39-
class FileInfo;
40-
}
41-
42-
/// @addtogroup Checks
4337
/** @brief Check for functions never called */
4438
/// @{
4539

46-
class CPPCHECKLIB CheckUnusedFunctions : public Check {
40+
class CPPCHECKLIB CheckUnusedFunctions {
4741
friend class TestSuppressions;
4842
friend class TestSingleExecutorBase;
4943
friend class TestProcessExecutorBase;
5044
friend class TestThreadExecutorBase;
5145
friend class TestUnusedFunctions;
5246

5347
public:
54-
/** @brief This constructor is used when registering the CheckUnusedFunctions */
55-
CheckUnusedFunctions() : Check(myName()) {}
56-
57-
/** @brief This constructor is used when running checks. */
58-
CheckUnusedFunctions(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
59-
: Check(myName(), tokenizer, settings, errorLogger) {}
48+
CheckUnusedFunctions() = default;
6049

6150
// Parse current tokens and determine..
6251
// * Check what functions are used
@@ -67,8 +56,7 @@ class CPPCHECKLIB CheckUnusedFunctions : public Check {
6756

6857
std::string analyzerInfo() const;
6958

70-
/** @brief Combine and analyze all analyzerInfos for all TUs */
71-
static void analyseWholeProgram2(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir);
59+
static void analyseWholeProgram(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir);
7260

7361
static void getErrorMessages(ErrorLogger *errorLogger) {
7462
unusedFunctionError(errorLogger, emptyString, 0, 0, "funcName");
@@ -82,25 +70,10 @@ class CPPCHECKLIB CheckUnusedFunctions : public Check {
8270
// Return true if an error is reported.
8371
bool check(ErrorLogger * const errorLogger, const Settings& settings) const;
8472

85-
void getErrorMessages(ErrorLogger */*errorLogger*/, const Settings * /*settings*/) const override {}
86-
87-
void runChecks(const Tokenizer & /*tokenizer*/, ErrorLogger * /*errorLogger*/) override {}
88-
89-
/**
90-
* Dummy implementation, just to provide error for --errorlist
91-
*/
9273
static void unusedFunctionError(ErrorLogger * const errorLogger,
9374
const std::string &filename, unsigned int fileIndex, unsigned int lineNumber,
9475
const std::string &funcname);
9576

96-
static std::string myName() {
97-
return "Unused functions";
98-
}
99-
100-
std::string classInfo() const override {
101-
return "Check for functions that are never called\n";
102-
}
103-
10477
struct CPPCHECKLIB FunctionUsage {
10578
std::string filename;
10679
unsigned int lineNumber{};

‎lib/cppcheck.cpp‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
629629
mPlistFile.close();
630630
}
631631

632-
CheckUnusedFunctions checkUnusedFunctions(nullptr, nullptr, nullptr);
632+
CheckUnusedFunctions checkUnusedFunctions;
633633

634634
try {
635635
if (mSettings.library.markupFile(filename)) {
@@ -1074,39 +1074,39 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
10741074
const char* unusedFunctionOnly = std::getenv("UNUSEDFUNCTION_ONLY");
10751075
const bool doUnusedFunctionOnly = unusedFunctionOnly && (std::strcmp(unusedFunctionOnly, "1") == 0);
10761076

1077-
const std::time_t maxTime = mSettings.checksMaxTime > 0 ? std::time(nullptr) + mSettings.checksMaxTime : 0;
1077+
if (!doUnusedFunctionOnly) {
1078+
const std::time_t maxTime = mSettings.checksMaxTime > 0 ? std::time(nullptr) + mSettings.checksMaxTime : 0;
10781079

1079-
// call all "runChecks" in all registered Check classes
1080-
// cppcheck-suppress shadowFunction - TODO: fix this
1081-
for (Check *check : Check::instances()) {
1082-
if (Settings::terminated())
1083-
return;
1084-
1085-
if (maxTime > 0 && std::time(nullptr) > maxTime) {
1086-
if (mSettings.debugwarnings) {
1087-
ErrorMessage::FileLocation loc;
1088-
loc.setfile(tokenizer.list.getFiles()[0]);
1089-
ErrorMessage errmsg({std::move(loc)},
1090-
emptyString,
1091-
Severity::debug,
1092-
"Checks maximum time exceeded",
1093-
"checksMaxTime",
1094-
Certainty::normal);
1095-
reportErr(errmsg);
1080+
// call all "runChecks" in all registered Check classes
1081+
// cppcheck-suppress shadowFunction - TODO: fix this
1082+
for (Check *check : Check::instances()) {
1083+
if (Settings::terminated())
1084+
return;
1085+
1086+
if (maxTime > 0 && std::time(nullptr) > maxTime) {
1087+
if (mSettings.debugwarnings) {
1088+
ErrorMessage::FileLocation loc;
1089+
loc.setfile(tokenizer.list.getFiles()[0]);
1090+
ErrorMessage errmsg({std::move(loc)},
1091+
emptyString,
1092+
Severity::debug,
1093+
"Checks maximum time exceeded",
1094+
"checksMaxTime",
1095+
Certainty::normal);
1096+
reportErr(errmsg);
1097+
}
1098+
return;
10961099
}
1097-
return;
1098-
}
10991100

1100-
if (doUnusedFunctionOnly && dynamic_cast<CheckUnusedFunctions*>(check) == nullptr)
1101-
continue;
1102-
1103-
Timer timerRunChecks(check->name() + "::runChecks", mSettings.showtime, &s_timerResults);
1104-
check->runChecks(tokenizer, this);
1101+
Timer timerRunChecks(check->name() + "::runChecks", mSettings.showtime, &s_timerResults);
1102+
check->runChecks(tokenizer, this);
1103+
}
11051104
}
11061105

1107-
if (mSettings.clang)
1106+
if (mSettings.clang) {
11081107
// TODO: Use CTU for Clang analysis
11091108
return;
1109+
}
11101110

11111111

11121112
if (mSettings.useSingleJob() || !mSettings.buildDir.empty()) {
@@ -1121,18 +1121,17 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
11211121
delete fi1;
11221122
}
11231123

1124-
// cppcheck-suppress shadowFunction - TODO: fix this
1125-
for (const Check *check : Check::instances()) {
1126-
if (doUnusedFunctionOnly && dynamic_cast<const CheckUnusedFunctions*>(check) == nullptr)
1127-
continue;
1128-
1129-
if (Check::FileInfo * const fi = check->getFileInfo(&tokenizer, &mSettings)) {
1130-
if (!mSettings.buildDir.empty())
1131-
mAnalyzerInformation.setFileInfo(check->name(), fi->toString());
1132-
if (mSettings.useSingleJob())
1133-
mFileInfo.push_back(fi);
1134-
else
1135-
delete fi;
1124+
if (!doUnusedFunctionOnly) {
1125+
// cppcheck-suppress shadowFunction - TODO: fix this
1126+
for (const Check *check : Check::instances()) {
1127+
if (Check::FileInfo * const fi = check->getFileInfo(&tokenizer, &mSettings)) {
1128+
if (!mSettings.buildDir.empty())
1129+
mAnalyzerInformation.setFileInfo(check->name(), fi->toString());
1130+
if (mSettings.useSingleJob())
1131+
mFileInfo.push_back(fi);
1132+
else
1133+
delete fi;
1134+
}
11361135
}
11371136
}
11381137

@@ -1797,7 +1796,7 @@ void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<
17971796
return;
17981797
}
17991798
if (mSettings.checks.isEnabled(Checks::unusedFunction))
1800-
CheckUnusedFunctions::analyseWholeProgram2(mSettings, this, buildDir);
1799+
CheckUnusedFunctions::analyseWholeProgram(mSettings, this, buildDir);
18011800
std::list<Check::FileInfo*> fileInfoList;
18021801
CTU::FileInfo ctuFileInfo;
18031802

‎test/testunusedfunctions.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class TestUnusedFunctions : public TestFixture {
9595
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
9696

9797
// Check for unused functions..
98-
CheckUnusedFunctions checkUnusedFunctions(&tokenizer, &settings1, this);
98+
CheckUnusedFunctions checkUnusedFunctions;
9999
checkUnusedFunctions.parseTokens(tokenizer, "someFile.c", &settings1);
100100
// check() returns error if and only if errout is not empty.
101101
if ((checkUnusedFunctions.check)(this, settings1)) {
@@ -538,7 +538,7 @@ class TestUnusedFunctions : public TestFixture {
538538

539539
void multipleFiles() {
540540
Tokenizer tokenizer(settings, this);
541-
CheckUnusedFunctions c(&tokenizer, &settings, nullptr);
541+
CheckUnusedFunctions c;
542542

543543
// Clear the error buffer..
544544
errout.str("");

0 commit comments

Comments
 (0)