Merge pull request #3568 from roystgnr/sanitize_integer

Get a clean `-fsanitize=integer` run of `make check`

Author: roystgnr

contrib/fparser/util/bytecoderules_parser.cc

@@ -131,7 +131,7 @@ namespace
                       size_t indent)
         {
             std::string codehash, prevlabel;
-            for(size_t a=chain.size(); a-- > 0; )
+            for(ptrdiff_t a=chain.size(); a-- > 0; )
             {
                 codehash += chain[a];
                 std::string label = GenLabel(codehash);
@@ -509,7 +509,7 @@ namespace
             outstream << "\n" << Indent(indent+1);
 
         outstream << '"';
-        for(size_t a=so_far.size(); a-- > 0; )
+        for(ptrdiff_t a=so_far.size(); a-- > 0; )
         {
             if(a+1 != so_far.size()) outstream << " ";
             outstream << so_far[a].name;
@@ -1269,7 +1269,7 @@ namespace
             }
 
             Node* head = &global_head;
-            for(size_t b=sequence.size(); b-->0; )
+            for(ptrdiff_t b=sequence.size(); b-->0; )
             {
                 const Match& m = sequence[b];
                 bool dup = false;

contrib/timpi

@@ -0,0 +1,15 @@
+# This is a set of exceptions to use in
+# '-fsanitize-ignorelist=yourdir/fsanitize_ignorelist.txt'
+#
+# So far it's been tested and found to be complete for
+# -fsanitize=integer on clang++ 14 with g++ 12.1.0 headers
+fun:*basic_string_view*rfind*
+fun:*basic_string*compare*
+src:*hashing.h
+src:*hashword.h
+src:*libHilbert*SetBits*
+src:*fpoptimizer*
+src:*fp_opcode_add*
+src:*bytecodesynth*
+src:*fparser.cc
+src:*Eigen/*

fsanitize_ignorelist.txt

@@ -2777,7 +2777,7 @@ GetPot::_DBE_expand_string(const std::string& str)
   unsigned first = 0;
   for (unsigned i = 0;  i<str.size(); i++)
     {
-      if (i < str.size() - 2 && str.substr(i, 2) == "${")
+      if (i + 2 < str.size() && str.substr(i, 2) == "${")
         {
           if (open_brackets == 0)
             first = i+2;

include/base/getpot.h

@@ -125,8 +125,8 @@ NameBasedIO::is_parallel_file_format (std::string_view name)
 {
   return ((name.rfind(".xda") < name.size()) ||
           (name.rfind(".xdr") < name.size()) ||
-          (name.rfind(".nem") + 4 == name.size()) ||
-          (name.rfind(".n") + 2 == name.size()) ||
+          (name.rfind(".nem") == name.size() - 4) ||
+          (name.rfind(".n") == name.size() - 2) ||
           (name.rfind(".cp") < name.size())
           );
 }

include/mesh/namebased_io.h

@@ -427,7 +427,7 @@ class RBConstruction : public RBConstructionBase<LinearImplicitSystem>
    */
   void set_rb_construction_parameters(unsigned int n_training_samples_in,
                                       bool deterministic_training_in,
-                                      unsigned int training_parameters_random_seed_in,
+                                      int training_parameters_random_seed_in,
                                       bool quiet_mode_in,
                                       unsigned int Nmax_in,
                                       Real rel_training_tolerance_in,

include/reduced_basis/rb_construction.h

@@ -156,7 +156,7 @@ class RBConstructionBase : public Base, public RBParametrized
   /**
    * Set the seed that is used to randomly generate training parameters.
    */
-  void set_training_random_seed(unsigned int seed);
+  void set_training_random_seed(int seed);
 
   /**
    * In some cases we only want to allow discrete parameter values, instead

include/reduced_basis/rb_construction_base.h

@@ -128,7 +128,7 @@ class RBEIMConstruction : public RBConstructionBase<System>
    */
   void set_rb_construction_parameters(unsigned int n_training_samples_in,
                                       bool deterministic_training_in,
-                                      unsigned int training_parameters_random_seed_in,
+                                      int training_parameters_random_seed_in,
                                       bool quiet_mode_in,
                                       unsigned int Nmax_in,
                                       Real rel_training_tolerance_in,

include/reduced_basis/rb_eim_construction.h

@@ -2447,7 +2447,7 @@ void DofMap::_dof_indices (const Elem & elem,
                   di.resize(di.size() + nc, DofObject::invalid_id);
                 }
               else
-                for (int i=n_comp-1; i>=dof_offset; i--)
+                for (int i=int(n_comp)-1; i>=dof_offset; i--)
                   {
                     const dof_id_type d =
                       node.dof_number(sys_num, vg, vig, i, n_comp);
@@ -2685,7 +2685,7 @@ void DofMap::old_dof_indices (const Elem * const elem,
                       }
 
                     // Compute the net amount of "extra" order, including Elem::p_level()
-                    int extra_order = elem->p_level() + p_adjustment;
+                    int extra_order = int(elem->p_level()) + p_adjustment;
 
                     FEType fe_type = var.type();
 

src/base/dof_map.C

@@ -1717,7 +1717,7 @@ dof_id_type DofMap::n_local_constrained_dofs() const
   const DofConstraints::const_iterator lower =
     _dof_constraints.lower_bound(this->first_dof()),
     upper =
-    _dof_constraints.upper_bound(this->end_dof()-1);
+    _dof_constraints.lower_bound(this->end_dof());
 
   return cast_int<dof_id_type>(std::distance(lower, upper));
 }
@@ -2086,7 +2086,7 @@ void DofMap::process_mesh_constraint_rows(const MeshBase & mesh)
 
               if (was_previously_constrained.count(constrained_id))
                 {
-                  for (auto q : IntRange<unsigned int>(0, n_adjoint_rhs+1))
+                  for (auto q : IntRange<int>(0, n_adjoint_rhs+1))
                     {
                       DenseMatrix<Number> K(1,1);
                       DenseVector<Number> F(1);