Merge branch 'main' of https://github.com/danmar/cppcheck into swap-error-message-arg-order

Author: GNL10

Makefile

@@ -132,7 +132,7 @@ ifeq (clang++, $(findstring clang++,$(CXX)))
     CPPCHK_GLIBCXX_DEBUG=
 endif
 ifndef CXXFLAGS
-    CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-sign-compare -Wno-multichar -Woverloaded-virtual $(CPPCHK_GLIBCXX_DEBUG) -g
+    CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-sign-compare -Wno-multichar -Woverloaded-virtual -g
 endif
 
 ifeq (g++, $(findstring g++,$(CXX)))

lib/importproject.cpp

@@ -79,7 +79,7 @@ void ImportProject::fsSetDefines(FileSettings& fs, std::string defs)
     while (!defs.empty() && defs[0] == ';')
         defs.erase(0, 1);
     while (!defs.empty() && endsWith(defs,';'))
-        defs.erase(defs.size() - 1U); // TODO: Use std::string::pop_back() as soon as travis supports it
+        defs.pop_back();
     bool eq = false;
     for (std::size_t pos = 0; pos < defs.size(); ++pos) {
         if (defs[pos] == '(' || defs[pos] == '=')

lib/programmemory.cpp

@@ -61,7 +61,6 @@ std::size_t ExprIdToken::Hash::operator()(ExprIdToken etok) const
 void ProgramMemory::setValue(const Token* expr, const ValueFlow::Value& value) {
     copyOnWrite();
 
-    (*mValues)[expr] = value;
     ValueFlow::Value subvalue = value;
     const Token* subexpr = solveExprValue(
         expr,
@@ -74,6 +73,8 @@ void ProgramMemory::setValue(const Token* expr, const ValueFlow::Value& value) {
         return {};
     },
         subvalue);
+    if (expr != subexpr)
+        (*mValues)[expr] = value;
     if (subexpr)
         (*mValues)[subexpr] = std::move(subvalue);
 }

tools/bisect/bisect_common.py

@@ -33,7 +33,8 @@ def build_cppcheck(bisect_path):
     # TODO: use "make install"?
     # TODO: use CXXOPTS overrides to workaround compiling issues in older versions
     print('building {}'.format(commit_hash))
-    subprocess.check_call(['make', '-C', bisect_repo_dir, '-j6', 'MATCHCOMPILER=yes', 'CXXOPTS=-O2 -w -pipe', '-s'])
+    # we always need to use CXXFLAGS because we need to support older versions
+    subprocess.check_call(['make', '-C', bisect_repo_dir, '-j6', 'MATCHCOMPILER=yes', 'CXXFLAGS=-O2 -w -pipe', '-s'])
 
     # TODO: remove folder if installation failed
     print('installing {}'.format(commit_hash))

tools/dmake/dmake.cpp

@@ -725,7 +725,7 @@ int main(int argc, char **argv)
                                 "-Wno-sign-compare "
                                 "-Wno-multichar "
                                 "-Woverloaded-virtual "
-                                "$(CPPCHK_GLIBCXX_DEBUG) "
+                                //"$(CPPCHK_GLIBCXX_DEBUG) " // TODO: when using CXXOPTS this would always be set - need to handle this differently
                                 "-g");
     }