Merge pull request #493 from mgudemann/fix_shift_overflow_irep_hash_container

fix shift overflow in irep_hash_container

Author: Daniel Kroening

src/util/irep_hash_container.cpp

@@ -21,7 +21,7 @@ Function: irep_hash_container_baset::number
 
 \*******************************************************************/
 
-unsigned irep_hash_container_baset::number(const irept &irep)
+size_t irep_hash_container_baset::number(const irept &irep)
 {
   // the ptr-hash provides a speedup of up to 3x
 
@@ -32,7 +32,7 @@ unsigned irep_hash_container_baset::number(const irept &irep)
 
   packedt packed;
   pack(irep, packed);
-  unsigned id=numbering.number(packed);
+  size_t id=numbering.number(packed);
 
   ptr_hash[&irep.read()]=id;
 

src/util/irep_hash_container.h

@@ -12,16 +12,17 @@ Author: Daniel Kroening, [email protected]
 #include <cstdlib>  // for size_t
 #include <vector>
 
+#include "irep_hash.h"
 #include "numbering.h"
 
 class irept;
 
 class irep_hash_container_baset
 {
 public:
-  unsigned number(const irept &irep);
+  size_t number(const irept &irep);
 
-  irep_hash_container_baset(bool _full):full(_full)
+  explicit irep_hash_container_baset(bool _full):full(_full)
   {
   }
 
@@ -36,33 +37,34 @@ class irep_hash_container_baset
 
   // this is the first level: address of the content
 
-  struct pointer_hash
+  struct pointer_hasht
   {
     inline size_t operator()(const void *p) const
     {
       return (size_t)p;
     }
   };
 
-  typedef std::unordered_map<const void *, unsigned, pointer_hash> ptr_hasht;
+  typedef std::unordered_map<const void *, size_t, pointer_hasht>
+    ptr_hasht;
   ptr_hasht ptr_hash;
 
   // this is the second level: content
 
-  typedef std::vector<unsigned> packedt;
+  typedef std::vector<size_t> packedt;
 
-  struct vector_hash
+  struct vector_hasht
   {
     inline size_t operator()(const packedt &p) const
     {
-      size_t result=p.size();
-      for(unsigned i=0; i<p.size(); i++)
-        result^=p[i]<<i;
+      size_t result=p.size(); // seed
+      for(auto elem : p)
+        result=hash_combine(result, elem);
       return result;
     }
   };
 
-  typedef hash_numbering<packedt, vector_hash> numberingt;
+  typedef hash_numbering<packedt, vector_hasht> numberingt;
   numberingt numbering;
 
   void pack(const irept &irep, packedt &);