diff options
author | Brad King <brad.king@kitware.com> | 2021-06-04 10:57:45 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-04 10:57:51 (GMT) |
commit | ccaaca4e7d2a0d3ad981333bb36ceff779828c4f (patch) | |
tree | 3b3b5266a0bc9d9e1ecf73fc430875452d44be23 /Source | |
parent | c845b7ef379422a6490af67158dbe9e13c22d077 (diff) | |
parent | da14f4e19e72f2d7b7ea71ed420880358715a8f2 (diff) | |
download | CMake-ccaaca4e7d2a0d3ad981333bb36ceff779828c4f.zip CMake-ccaaca4e7d2a0d3ad981333bb36ceff779828c4f.tar.gz CMake-ccaaca4e7d2a0d3ad981333bb36ceff779828c4f.tar.bz2 |
Merge topic 'ci-clang-analyzer'
da14f4e19e gitlab-ci: add job to build with clang-analyzer
adc38da49f ci: add clang-analyzer to Fedora base image
b6c4d93dcd clang-analyzer: Suppress warnings in intentional use-after-move cases
c1b575f4d1 clang-analyzer: rename from scan-build in comments
dbfb50cd72 cmFileAPICodemodel: Assert input in DirectoryObject::DumpInstaller
410bf8ed4f cmStandardLevelResolver: Fix size assertion in constructor
82584b99e3 jsoncpp: Revert "Code style: add missed explicit 'this->'"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6189
Diffstat (limited to 'Source')
-rw-r--r-- | Source/LexerParser/cmCTestResourceGroupsLexer.cxx | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmCTestResourceGroupsLexer.in.l | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentLexer.cxx | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentLexer.in.l | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaLexer.cxx | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaLexer.in.l | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmExprLexer.cxx | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmExprLexer.in.l | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranLexer.cxx | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranLexer.in.l | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmGccDepfileLexer.cxx | 2 | ||||
-rw-r--r-- | Source/LexerParser/cmGccDepfileLexer.in.l | 2 | ||||
-rw-r--r-- | Source/cmFileAPICodemodel.cxx | 1 | ||||
-rw-r--r-- | Source/cmStandardLevelResolver.cxx | 2 |
14 files changed, 14 insertions, 13 deletions
diff --git a/Source/LexerParser/cmCTestResourceGroupsLexer.cxx b/Source/LexerParser/cmCTestResourceGroupsLexer.cxx index de07c46..85b379b 100644 --- a/Source/LexerParser/cmCTestResourceGroupsLexer.cxx +++ b/Source/LexerParser/cmCTestResourceGroupsLexer.cxx @@ -659,7 +659,7 @@ Modify cmCTestResourceGroupsLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include "cmCTestResourceGroupsLexerHelper.h" diff --git a/Source/LexerParser/cmCTestResourceGroupsLexer.in.l b/Source/LexerParser/cmCTestResourceGroupsLexer.in.l index 2aabea4..2befa85 100644 --- a/Source/LexerParser/cmCTestResourceGroupsLexer.in.l +++ b/Source/LexerParser/cmCTestResourceGroupsLexer.in.l @@ -18,7 +18,7 @@ Modify cmCTestResourceGroupsLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include "cmCTestResourceGroupsLexerHelper.h" diff --git a/Source/LexerParser/cmCommandArgumentLexer.cxx b/Source/LexerParser/cmCommandArgumentLexer.cxx index 46220ff..4b7eb79 100644 --- a/Source/LexerParser/cmCommandArgumentLexer.cxx +++ b/Source/LexerParser/cmCommandArgumentLexer.cxx @@ -664,7 +664,7 @@ Modify cmCommandArgumentLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include "cmCommandArgumentParserHelper.h" diff --git a/Source/LexerParser/cmCommandArgumentLexer.in.l b/Source/LexerParser/cmCommandArgumentLexer.in.l index 8ad2335..6b4f9a9 100644 --- a/Source/LexerParser/cmCommandArgumentLexer.in.l +++ b/Source/LexerParser/cmCommandArgumentLexer.in.l @@ -18,7 +18,7 @@ Modify cmCommandArgumentLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include "cmCommandArgumentParserHelper.h" diff --git a/Source/LexerParser/cmDependsJavaLexer.cxx b/Source/LexerParser/cmDependsJavaLexer.cxx index d703e3c..bfe7e64 100644 --- a/Source/LexerParser/cmDependsJavaLexer.cxx +++ b/Source/LexerParser/cmDependsJavaLexer.cxx @@ -860,7 +860,7 @@ Modify cmDependsJavaLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include <iostream> diff --git a/Source/LexerParser/cmDependsJavaLexer.in.l b/Source/LexerParser/cmDependsJavaLexer.in.l index 3dd3c22..942e007 100644 --- a/Source/LexerParser/cmDependsJavaLexer.in.l +++ b/Source/LexerParser/cmDependsJavaLexer.in.l @@ -18,7 +18,7 @@ Modify cmDependsJavaLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include <iostream> diff --git a/Source/LexerParser/cmExprLexer.cxx b/Source/LexerParser/cmExprLexer.cxx index 72e59b6..5a76590 100644 --- a/Source/LexerParser/cmExprLexer.cxx +++ b/Source/LexerParser/cmExprLexer.cxx @@ -664,7 +664,7 @@ Modify cmExprLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include "cmExprParserHelper.h" diff --git a/Source/LexerParser/cmExprLexer.in.l b/Source/LexerParser/cmExprLexer.in.l index f8a4224..90c1cc3 100644 --- a/Source/LexerParser/cmExprLexer.in.l +++ b/Source/LexerParser/cmExprLexer.in.l @@ -18,7 +18,7 @@ Modify cmExprLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include "cmExprParserHelper.h" diff --git a/Source/LexerParser/cmFortranLexer.cxx b/Source/LexerParser/cmFortranLexer.cxx index bcda77c..c3d0000 100644 --- a/Source/LexerParser/cmFortranLexer.cxx +++ b/Source/LexerParser/cmFortranLexer.cxx @@ -838,7 +838,7 @@ Modify cmFortranLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #undef YY_NO_UNPUT diff --git a/Source/LexerParser/cmFortranLexer.in.l b/Source/LexerParser/cmFortranLexer.in.l index 3d38a7d..05769a1 100644 --- a/Source/LexerParser/cmFortranLexer.in.l +++ b/Source/LexerParser/cmFortranLexer.in.l @@ -27,7 +27,7 @@ Modify cmFortranLexer.cxx: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #undef YY_NO_UNPUT diff --git a/Source/LexerParser/cmGccDepfileLexer.cxx b/Source/LexerParser/cmGccDepfileLexer.cxx index 3630f4e..194ae0c 100644 --- a/Source/LexerParser/cmGccDepfileLexer.cxx +++ b/Source/LexerParser/cmGccDepfileLexer.cxx @@ -645,7 +645,7 @@ static const flex_int16_t yy_chk[46] = /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include <cmGccDepfileLexerHelper.h> #include <string> diff --git a/Source/LexerParser/cmGccDepfileLexer.in.l b/Source/LexerParser/cmGccDepfileLexer.in.l index c83cb75..aa2351e 100644 --- a/Source/LexerParser/cmGccDepfileLexer.in.l +++ b/Source/LexerParser/cmGccDepfileLexer.in.l @@ -4,7 +4,7 @@ /* IWYU pragma: no_forward_declare yyguts_t */ -#ifndef __clang_analyzer__ /* Suppress clang scan-build warnings */ +#ifndef __clang_analyzer__ /* Suppress clang-analyzer warnings */ #include <cmGccDepfileLexerHelper.h> #include <string> diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index ff11f4a..efe1ab6 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -874,6 +874,7 @@ Json::Value DirectoryObject::DumpInstallers() Json::Value DirectoryObject::DumpInstaller(cmInstallGenerator* gen) { + assert(gen); Json::Value installer = Json::objectValue; // Exclude subdirectory installers. They are implementation details. diff --git a/Source/cmStandardLevelResolver.cxx b/Source/cmStandardLevelResolver.cxx index 85411e6..b198a00 100644 --- a/Source/cmStandardLevelResolver.cxx +++ b/Source/cmStandardLevelResolver.cxx @@ -62,7 +62,7 @@ struct StanardLevelComputer , Levels(std::move(levels)) , LevelsAsStrings(std::move(levelsStr)) { - assert(levels.size() == levelsStr.size()); + assert(this->Levels.size() == this->LevelsAsStrings.size()); } std::string GetCompileOptionDef(cmMakefile* makefile, |