refs #14498 - do not create static instances of the checks

Author: firewave

Makefile

@@ -20,6 +20,7 @@
 
 #include "addoninfo.h"
 #include "check.h"
+#include "checks.h"
 #include "checkers.h"
 #include "color.h"
 #include "config.h"
@@ -359,9 +360,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         if (std::strcmp(argv[i], "--doc") == 0) {
             std::ostringstream doc;
             // Get documentation..
-            for (const Check * it : Check::instances()) {
-                const std::string& name(it->name());
-                const std::string info(it->classInfo());
+            for (auto *const c : CheckInstances::get()) {
+                const std::string& name(c->name());
+                const std::string info(c->classInfo());
                 if (!name.empty() && !info.empty())
                     doc << "## " << name << " ##\n"
                         << info << "\n";

cli/cmdlineparser.cpp

@@ -26,34 +26,15 @@
 #include "tokenize.h"
 #include "vfvalue.h"
 
-#include <algorithm>
 #include <cctype>
 #include <iostream>
-#include <stdexcept>
 #include <utility>
 
 //---------------------------------------------------------------------------
 
-Check::Check(const std::string &aname)
-    : mName(aname)
-{
-    {
-        const auto it = std::find_if(instances().begin(), instances().end(), [&](const Check *i) {
-            return i->name() == aname;
-        });
-        if (it != instances().end())
-            throw std::runtime_error("'" + aname + "' instance already exists");
-    }
-
-    // make sure the instances are sorted
-    const auto it = std::find_if(instances().begin(), instances().end(), [&](const Check* i) {
-        return i->name() > aname;
-    });
-    if (it == instances().end())
-        instances().push_back(this);
-    else
-        instances().insert(it, this);
-}
+Check::Check(std::string aname)
+    : mName(std::move(aname))
+{}
 
 void Check::writeToErrorList(const ErrorMessage &errmsg)
 {
@@ -88,19 +69,6 @@ bool Check::wrongData(const Token *tok, const char *str)
     return true;
 }
 
-std::list<Check *> &Check::instances()
-{
-#ifdef __SVR4
-    // Under Solaris, destructors are called in wrong order which causes a segmentation fault.
-    // This fix ensures pointer remains valid and reachable until program terminates.
-    static std::list<Check *> *_instances= new std::list<Check *>;
-    return *_instances;
-#else
-    static std::list<Check *> _instances;
-    return _instances;
-#endif
-}
-
 std::string Check::getMessageId(const ValueFlow::Value &value, const char id[])
 {
     if (value.condition != nullptr)

lib/check.cpp

@@ -59,25 +59,19 @@ class Tokenizer;
 class CPPCHECKLIB Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    explicit Check(const std::string &aname);
+    explicit Check(std::string aname);
 
 protected:
     /** This constructor is used when running checks. */
     Check(std::string aname, const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : mTokenizer(tokenizer), mSettings(settings), mErrorLogger(errorLogger), mName(std::move(aname)) {}
 
 public:
-    virtual ~Check() {
-        if (!mTokenizer)
-            instances().remove(this);
-    }
+    virtual ~Check() = default;
 
     Check(const Check &) = delete;
     Check& operator=(const Check &) = delete;
 
-    /** List of registered check classes. This is used by Cppcheck to run checks and generate documentation */
-    static std::list<Check *> &instances();
-
     /** run checks, the token list is not simplified */
     virtual void runChecks(const Tokenizer &, ErrorLogger *) = 0;
 

lib/check.h

@@ -36,11 +36,6 @@
 // CWE ids used
 static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    Check64BitPortability instance;
-}
-
 static bool is32BitIntegerReturn(const Function* func, const Settings* settings)
 {
     if (settings->platform.sizeof_pointer != 8)

lib/check64bit.cpp

@@ -39,11 +39,6 @@
 // CWE ids used
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckAssert instance;
-}
-
 void CheckAssert::assertWithSideEffects()
 {
     if (!mSettings->severity.isEnabled(Severity::warning))

lib/checkassert.cpp

@@ -39,12 +39,6 @@
 
 //---------------------------------------------------------------------------
 
-
-// Register this check class into cppcheck by creating a static instance of it..
-namespace {
-    CheckAutoVariables instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE562(562U);  // Return of Stack Variable Address
 static const CWE CWE590(590U);  // Free of Memory not on the Heap

lib/checkautovariables.cpp

@@ -32,11 +32,6 @@
 #include <vector>
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckBool instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE571(571U);  // Expression is Always True
 static const CWE CWE587(587U);  // Assignment of a Fixed Address to a Pointer

lib/checkbool.cpp

@@ -50,13 +50,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckBufferOverrun instance;
-}
-
-//---------------------------------------------------------------------------
-
 // CWE ids used:
 static const CWE CWE131(131U);  // Incorrect Calculation of Buffer Size
 static const CWE CWE170(170U);  // Improper Null Termination

lib/checkbufferoverrun.cpp

@@ -43,11 +43,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register CheckClass..
-namespace {
-    CheckClass instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE404(404U);  // Improper Resource Shutdown or Release
 static const CWE CWE665(665U);  // Improper Initialization