Clang import; This experimental feature didn't "take off" much. After…

… a lot of work we are still far fram the goal. I remove it now but don't rule out completely that it could ever be added again.
danmar · Apr 21, 2021 · 207361b · 207361b
1 parent b5aaf8d
commit 207361b
Show file tree

Hide file tree

Showing 32 changed files with 8 additions and 3,505 deletions.
diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
@@ -121,7 +121,6 @@ jobs:
           copy .\bin\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel!
           copy .\bin\cppcheck-core.dll .\cppcheck-core.dll || exit /b !errorlevel!
           cd test/cli || exit /b !errorlevel!
-          python -m pytest --suppress-no-test-exit-code test-clang-import.py || exit /b !errorlevel!
           python -m pytest test-helloworld.py || exit /b !errorlevel!
           python -m pytest test-inline-suppress.py || exit /b !errorlevel!
           python -m pytest test-more-projects.py || exit /b !errorlevel!

diff --git a/Makefile b/Makefile
@@ -185,7 +185,6 @@ LIBOBJ =      $(libcppdir)/analyzerinfo.o \
               $(libcppdir)/checkunusedfunctions.o \
               $(libcppdir)/checkunusedvar.o \
               $(libcppdir)/checkvaarg.o \
-              $(libcppdir)/clangimport.o \
               $(libcppdir)/cppcheck.o \
               $(libcppdir)/ctu.o \
               $(libcppdir)/errorlogger.o \
@@ -233,7 +232,6 @@ TESTOBJ =     test/options.o \
               test/testbufferoverrun.o \
               test/testbughuntingchecks.o \
               test/testcharvar.o \
-              test/testclangimport.o \
               test/testclass.o \
               test/testcmdlineparser.o \
               test/testcondition.o \
@@ -493,10 +491,7 @@ $(libcppdir)/checkunusedvar.o: lib/checkunusedvar.cpp externals/simplecpp/simple
 $(libcppdir)/checkvaarg.o: lib/checkvaarg.cpp lib/astutils.h lib/check.h lib/checkvaarg.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/checkvaarg.o $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/astutils.h lib/clangimport.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/clangimport.o $(libcppdir)/clangimport.cpp
-
-$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/astutils.h lib/check.h lib/checkunusedfunctions.h lib/clangimport.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/exprengine.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h
+$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/astutils.h lib/check.h lib/checkunusedfunctions.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/exprengine.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/cppcheck.o $(libcppdir)/cppcheck.cpp
 
 $(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h
@@ -622,9 +617,6 @@ test/testbughuntingchecks.o: test/testbughuntingchecks.cpp lib/astutils.h lib/co
 test/testcharvar.o: test/testcharvar.cpp lib/astutils.h lib/check.h lib/checkother.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testcharvar.o test/testcharvar.cpp
 
-test/testclangimport.o: test/testclangimport.cpp lib/astutils.h lib/clangimport.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testclangimport.o test/testclangimport.cpp
-
 test/testclass.o: test/testclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testclass.o test/testclass.cpp
 

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -235,10 +235,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
             }
 
             else if (std::strncmp(argv[i], "--clang", 7) == 0) {
-                mSettings->clang = true;
-                if (std::strncmp(argv[i], "--clang=", 8) == 0) {
-                    mSettings->clangExecutable = argv[i] + 8;
-                }
+                printMessage("Cppcheck: Clang import has been removed");
             }
 
             else if (std::strncmp(argv[i], "--config-exclude=",17) ==0) {
@@ -992,18 +989,11 @@ void CmdLineParser::printHelp()
               "                          * faster analysis; Cppcheck will reuse the results if\n"
               "                            the hash for a file is unchanged.\n"
               "                          * some useful debug information, i.e. commands used to\n"
-              "                            execute clang/clang-tidy/addons.\n"
+              "                            execute clang-tidy/addons.\n"
               "    --check-config       Check cppcheck configuration. The normal code\n"
               "                         analysis is disabled by this flag.\n"
               "    --check-library      Show information messages when library files have\n"
               "                         incomplete info.\n"
-              "    --clang=<path>       Experimental: Use Clang parser instead of the builtin Cppcheck\n"
-              "                         parser. Takes the executable as optional parameter and\n"
-              "                         defaults to `clang`. Cppcheck will run the given Clang\n"
-              "                         executable, import the Clang AST and convert it into\n"
-              "                         Cppcheck data. After that the normal Cppcheck analysis is\n"
-              "                         used. You must have the executable in PATH if no path is\n"
-              "                         given.\n"
               "    --config-exclude=<dir>\n"
               "                         Path (prefix) to be excluded from configuration\n"
               "                         checking. Preprocessor configurations defined in\n"

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -873,7 +873,6 @@ Settings MainWindow::getCppcheckSettings()
             result.userDefines += define.toStdString();
         }
 
-        result.clang = mProjectFile->clangParser;
         result.bugHunting = mProjectFile->bugHunting;
         result.bugHuntingReport = " ";
 

diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
@@ -45,7 +45,6 @@ ProjectFile::ProjectFile(const QString &filename, QObject *parent) :
 void ProjectFile::clear()
 {
     const Settings settings;
-    clangParser = false;
     bugHunting = false;
     mRootPath.clear();
     mBuildDir.clear();
@@ -62,7 +61,7 @@ void ProjectFile::clear()
     mPlatform.clear();
     mSuppressions.clear();
     mAddons.clear();
-    mClangAnalyzer = mClangTidy = false;
+    mClangTidy = false;
     mAnalyzeAllVsConfigs = false;
     mCheckHeaders = true;
     mCheckUnusedTemplates = true;
@@ -118,9 +117,6 @@ bool ProjectFile::read(const QString &filename)
             if (xmlReader.name() == CppcheckXml::AnalyzeAllVsConfigsElementName)
                 mAnalyzeAllVsConfigs = readBool(xmlReader);
 
-            if (xmlReader.name() == CppcheckXml::Parser)
-                clangParser = true;
-
             if (xmlReader.name() == CppcheckXml::BugHunting)
                 bugHunting = true;
 
@@ -186,7 +182,6 @@ bool ProjectFile::read(const QString &filename)
             if (xmlReader.name() == CppcheckXml::ToolsElementName) {
                 QStringList tools;
                 readStringList(tools, xmlReader, CppcheckXml::ToolElementName);
-                mClangAnalyzer = tools.contains(CLANG_ANALYZER);
                 mClangTidy = tools.contains(CLANG_TIDY);
             }
 
@@ -875,12 +870,6 @@ bool ProjectFile::write(const QString &filename)
     xmlWriter.writeCharacters(mAnalyzeAllVsConfigs ? "true" : "false");
     xmlWriter.writeEndElement();
 
-    if (clangParser) {
-        xmlWriter.writeStartElement(CppcheckXml::Parser);
-        xmlWriter.writeCharacters("clang");
-        xmlWriter.writeEndElement();
-    }
-
     if (bugHunting) {
         xmlWriter.writeStartElement(CppcheckXml::BugHunting);
         xmlWriter.writeEndElement();
@@ -1016,8 +1005,6 @@ bool ProjectFile::write(const QString &filename)
                     CppcheckXml::AddonElementName);
 
     QStringList tools;
-    if (mClangAnalyzer)
-        tools << CLANG_ANALYZER;
     if (mClangTidy)
         tools << CLANG_TIDY;
     writeStringList(xmlWriter,
@@ -1077,8 +1064,6 @@ QStringList ProjectFile::fromNativeSeparators(const QStringList &paths)
 QStringList ProjectFile::getAddonsAndTools() const
 {
     QStringList ret(mAddons);
-    if (mClangAnalyzer)
-        ret << CLANG_ANALYZER;
     if (mClangTidy)
         ret << CLANG_TIDY;
     return ret;

diff --git a/gui/projectfile.h b/gui/projectfile.h
@@ -192,14 +192,6 @@ class ProjectFile : public QObject {
     */
     QStringList getAddonsAndTools() const;
 
-    bool getClangAnalyzer() const {
-        return false; //mClangAnalyzer;
-    }
-
-    void setClangAnalyzer(bool c) {
-        mClangAnalyzer = c;
-    }
-
     bool getClangTidy() const {
         return mClangTidy;
     }
@@ -388,9 +380,6 @@ class ProjectFile : public QObject {
         mCheckUnknownFunctionReturn = s;
     }
 
-    /** Use Clang parser */
-    bool clangParser;
-
     /** Bug hunting */
     bool bugHunting;
 protected:
@@ -583,9 +572,6 @@ class ProjectFile : public QObject {
      */
     QStringList mAddons;
 
-    /** @brief Execute clang analyzer? */
-    bool mClangAnalyzer;
-
     /** @brief Execute clang-tidy? */
     bool mClangTidy;
 

diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -270,10 +270,6 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     mUI.mCheckUnusedTemplates->setChecked(projectFile->getCheckUnusedTemplates());
     mUI.mMaxCtuDepth->setValue(projectFile->getMaxCtuDepth());
     mUI.mMaxTemplateRecursion->setValue(projectFile->getMaxTemplateRecursion());
-    if (projectFile->clangParser)
-        mUI.mBtnClangParser->setChecked(true);
-    else
-        mUI.mBtnCppcheckParser->setChecked(true);
     mUI.mBtnSafeClasses->setChecked(projectFile->safeChecks.classes);
     mUI.mBtnBugHunting->setChecked(projectFile->bugHunting);
     setExcludedPaths(projectFile->getExcludedPaths());
@@ -341,7 +337,6 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         mUI.mAddonMisra->setText(mUI.mAddonMisra->text() + ' ' + tr("(no rule texts file)"));
     }
 
-    mUI.mToolClangAnalyzer->setChecked(projectFile->getClangAnalyzer());
     mUI.mToolClangTidy->setChecked(projectFile->getClangTidy());
     if (CheckThread::clangTidyCmd().isEmpty()) {
         mUI.mToolClangTidy->setText(tr("Clang-tidy (not found)"));
@@ -368,7 +363,6 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     projectFile->setCheckPaths(getCheckPaths());
     projectFile->setExcludedPaths(getExcludedPaths());
     projectFile->setLibraries(getLibraries());
-    projectFile->clangParser = mUI.mBtnClangParser->isChecked();
     projectFile->safeChecks.classes = mUI.mBtnSafeClasses->isChecked();
     projectFile->bugHunting = mUI.mBtnBugHunting->isChecked();
     if (mUI.mComboBoxPlatform->currentText().endsWith(".xml"))
@@ -408,7 +402,6 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     if (mUI.mAddonMisra->isChecked())
         list << "misra";
     projectFile->setAddons(list);
-    projectFile->setClangAnalyzer(mUI.mToolClangAnalyzer->isChecked());
     projectFile->setClangTidy(mUI.mToolClangTidy->isChecked());
     projectFile->setTags(mUI.mEditTags->text().split(";", QString::SkipEmptyParts));
 }

diff --git a/gui/projectfiledialog.ui b/gui/projectfiledialog.ui
@@ -426,32 +426,6 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_10">
-         <property name="title">
-          <string>Parser</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_14">
-          <item>
-           <widget class="QRadioButton" name="mBtnCppcheckParser">
-            <property name="text">
-             <string>Cppcheck (built in)</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="mBtnClangParser">
-            <property name="text">
-             <string>Clang (experimental)</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item>
         <widget class="QGroupBox" name="groupBox_11">
          <property name="title">

diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
@@ -69,10 +69,6 @@ void StatsDialog::setProject(const ProjectFile* projectFile)
             QChartView *chartView;
             chartView = createChart(statsFile, "cppcheck");
             mUI.mTabHistory->layout()->addWidget(chartView);
-            if (projectFile->getClangAnalyzer()) {
-                chartView = createChart(statsFile, CLANG_ANALYZER);
-                mUI.mTabHistory->layout()->addWidget(chartView);
-            }
             if (projectFile->getClangTidy()) {
                 chartView = createChart(statsFile, CLANG_TIDY);
                 mUI.mTabHistory->layout()->addWidget(chartView);

diff --git a/lib/bughuntingchecks.cpp b/lib/bughuntingchecks.cpp
@@ -211,7 +211,7 @@ static void divByZero(const Token *tok, const ExprEngine::Value &value, ExprEngi
     if (tok->astParent()->astOperand2() == tok && value.isEqual(dataBase, 0)) {
         const char * const id = (tok->valueType() && tok->valueType()->isFloat()) ? "bughuntingDivByZeroFloat" : "bughuntingDivByZero";
         const bool bailout = (value.type == ExprEngine::ValueType::BailoutValue);
-        dataBase->reportError(dataBase->settings->clang ? tok : tok->astParent(),
+        dataBase->reportError(tok->astParent(),
                               Severity::SeverityType::error,
                               id,
                               "There is division, cannot determine that there can't be a division by zero.",

diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -188,9 +188,6 @@ void CheckLeakAutoVar::doubleFreeError(const Token *tok, const Token *prevFreeTo
 
 void CheckLeakAutoVar::check()
 {
-    if (mSettings->clang)
-        return;
-
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Local variables that are known to be non-zero.

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -758,9 +758,6 @@ void CheckMemoryLeakInClass::publicAllocationError(const Token *tok, const std::
 
 void CheckMemoryLeakStructMember::check()
 {
-    if (mSettings->clang)
-        return;
-
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || !var->isLocal() || var->isStatic() || var->isReference())

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -884,9 +884,6 @@ void CheckOther::unreachableCodeError(const Token *tok, bool inconclusive)
 //---------------------------------------------------------------------------
 void CheckOther::checkVariableScope()
 {
-    if (mSettings->clang)
-        return;
-
     if (!mSettings->severity.isEnabled(Severity::style))
         return;
 

diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
@@ -65,9 +65,6 @@ class CPPCHECKLIB CheckUninitVar : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
-        if (settings->clang)
-            return;
-
         CheckUninitVar checkUninitVar(tokenizer, settings, errorLogger);
         checkUninitVar.check();
         checkUninitVar.valueFlowUninit();

diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1145,9 +1145,6 @@ void CheckUnusedVar::checkFunctionVariableUsage()
     if (!mSettings->severity.isEnabled(Severity::style))
         return;
 
-    if (mSettings->clang)
-        return;
-
     // Parse all executing scopes..
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 

diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
@@ -95,8 +95,6 @@ void CheckVaarg::referenceAs_va_start_error(const Token *tok, const std::string&
 
 void CheckVaarg::va_list_usage()
 {
-    if (mSettings->clang)
-        return;
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || var->isPointer() || var->isReference() || var->isArray() || !var->scope() || var->typeStartToken()->str() != "va_list")