Merge branch 'develop' into wip-isildur-g-cppcheck66

diff --cc src/nfa/castlecompile.cpp
Simple merge

diff --cc src/nfagraph/ng_anchored_dots.cpp
Simple merge

diff --cc src/nfagraph/ng_extparam.cpp
Simple merge

diff --cc src/nfagraph/ng_fuzzy.cpp
index 0d6d76add166a5e0c32679cade7b0e5c6ce49a18,20c762880a35d7ea25b533be9380819d6ade1cd3..67d6348a00eca59662e2c37687d71360b4a03330
--- 1/src/nfagraph/ng_fuzzy.cpp
--- 2/src/nfagraph/ng_fuzzy.cpp
+++ b/src/nfagraph/ng_fuzzy.cpp
@@@ -582,11 -582,11 +582,11 @@@ private
  
          // set up all reports
          bool clone = false;
-         for (auto &pair : reports_to_vertices) {
+         for (const auto &pair : reports_to_vertices) {
              const auto &reports = pair.first;
 -            const auto &vertices = pair.second;
 +            const auto &svertices = pair.second;
  
 -            for (auto src : vertices) {
 +            for (auto src : svertices) {
                  // get all predecessors up to edit distance
                  auto src_vertices_by_depth =
                          gatherPredecessorsByDepth(g, src, edit_distance);

diff --cc src/nfagraph/ng_limex_accel.cpp
Simple merge

diff --cc src/nfagraph/ng_repeat.cpp
Simple merge

diff --cc src/nfagraph/ng_som.cpp
Simple merge

diff --cc src/nfagraph/ng_som_add_redundancy.cpp
index 44afcee4db1c7ca607c3d07c620054664fb65dd8,f8f953be432063a4202489e1e1c3f534b1fa41ed..1467b15715f900e900a300562d6ccc410a6b3b90
--- 1/src/nfagraph/ng_som_add_redundancy.cpp
--- 2/src/nfagraph/ng_som_add_redundancy.cpp
+++ b/src/nfagraph/ng_som_add_redundancy.cpp
@@@ -112,9 -112,9 +112,9 @@@ bool forkVertex(NFAVertex v, NGHolder &
      }
      *numNewVertices += predGroups.size();
  
-     for (auto &group : predGroups) {
+     for (const auto &group : predGroups) {
          const depth &predDepth = group.first;
 -        const vector<NFAEdge> &preds = group.second;
 +        const vector<NFAEdge> &gspreds = group.second;
  
          // Clone v for this depth with all its associated out-edges.
          u32 clone_idx = depths.size(); // next index to be used

diff --cc src/nfagraph/ng_squash.cpp
Simple merge

diff --cc src/nfagraph/ng_violet.cpp
Simple merge

diff --cc src/rose/rose_build_add.cpp
Simple merge

diff --cc src/rose/rose_build_add_mask.cpp
Simple merge

diff --cc src/rose/rose_build_bytecode.cpp
Simple merge

diff --cc src/rose/rose_build_matchers.cpp
Simple merge

diff --cc src/rose/rose_build_merge.cpp
index ed2a350ff2a4dc47ad59abacb456c94ce6d08add,12843b9ab022716ee7a09cafd17a60fc5727ea80..09c2175e2d9be2498e8df19275a1c73dedf0f931
--- 1/src/rose/rose_build_merge.cpp
--- 2/src/rose/rose_build_merge.cpp
+++ b/src/rose/rose_build_merge.cpp
@@@ -1599,7 -1599,8 +1599,8 @@@ void dedupeLeftfixesVariableLag(RoseBui
                  continue;
              }
          }
-         engine_groups[DedupeLeftKey(build, std::move(vpreds), left)].emplace_back(left);
 -        auto preds_copy = std::move(preds);
++        auto preds_copy = std::move(vpreds);
+         engine_groups[DedupeLeftKey(build, preds_copy , left)].emplace_back(left);
      }
  
      /* We don't bother chunking as we expect deduping to be successful if the

diff --cc src/rose/rose_build_role_aliasing.cpp
Simple merge