Merge pull request #2093 from owen-jones-diffblue/owen-jones-diffblue/remove_unnecessary_irep_id_hash

Remove unnecessary uses of irep_id_hash

Author: Daniel Kroening

src/analyses/call_graph.cpp

@@ -172,7 +172,7 @@ class function_indicest
   call_grapht::directed_grapht &graph;
 
 public:
-  std::unordered_map<irep_idt, node_indext, irep_id_hash> function_indices;
+  std::unordered_map<irep_idt, node_indext> function_indices;
 
   explicit function_indicest(call_grapht::directed_grapht &graph):
     graph(graph)

src/analyses/call_graph.h

@@ -119,7 +119,7 @@ class call_grapht
     friend class call_grapht;
 
     /// Maps function names onto node indices
-    std::unordered_map<irep_idt, node_indext, irep_id_hash> nodes_by_name;
+    std::unordered_map<irep_idt, node_indext> nodes_by_name;
 
   public:
     /// Find the graph node by function name
@@ -128,8 +128,7 @@ class call_grapht
     optionalt<node_indext> get_node_index(const irep_idt &function) const;
 
     /// Type of the node name -> node index map.
-    typedef
-      std::unordered_map<irep_idt, node_indext, irep_id_hash> nodes_by_namet;
+    typedef std::unordered_map<irep_idt, node_indext> nodes_by_namet;
 
     /// Get the node name -> node index map
     /// \return node-by-name map

src/analyses/dirty.h

@@ -34,7 +34,6 @@ class dirtyt
 
 public:
   bool initialized;
-  typedef std::unordered_set<irep_idt, irep_id_hash> id_sett;
   typedef goto_functionst::goto_functiont goto_functiont;
 
   /// \post dirtyt objects that are created through this constructor are not
@@ -72,7 +71,7 @@ class dirtyt
     return operator()(expr.get_identifier());
   }
 
-  const id_sett &get_dirty_ids() const
+  const std::unordered_set<irep_idt> &get_dirty_ids() const
   {
     die_if_uninitialized();
     return dirty;
@@ -97,7 +96,7 @@ class dirtyt
   void build(const goto_functiont &goto_function);
 
   // variables whose address is taken
-  id_sett dirty;
+  std::unordered_set<irep_idt> dirty;
 
   void find_dirty(const exprt &expr);
   void find_dirty_address_of(const exprt &expr);
@@ -131,7 +130,7 @@ class incremental_dirtyt
 
 private:
   dirtyt dirty;
-  std::unordered_set<irep_idt, irep_id_hash> dirty_processed_functions;
+  std::unordered_set<irep_idt> dirty_processed_functions;
 };
 
 #endif // CPROVER_ANALYSES_DIRTY_H

src/analyses/invariant_propagation.cpp

@@ -40,8 +40,7 @@ void invariant_propagationt::add_objects(
   goto_program.get_decl_identifiers(locals);
 
   // cache the list for the locals to speed things up
-  typedef std::unordered_map<irep_idt, object_listt, irep_id_hash>
-    object_cachet;
+  typedef std::unordered_map<irep_idt, object_listt> object_cachet;
   object_cachet object_cache;
 
   forall_goto_program_instructions(i_it, goto_program)
@@ -133,8 +132,7 @@ void invariant_propagationt::add_objects(
     const goto_programt &goto_program=f_it->second.body;
 
     // cache the list for the locals to speed things up
-    typedef std::unordered_map<irep_idt, object_listt, irep_id_hash>
-      object_cachet;
+    typedef std::unordered_map<irep_idt, object_listt> object_cachet;
     object_cachet object_cache;
 
     forall_goto_program_instructions(i_it, goto_program)

src/analyses/reaching_definitions.h

@@ -60,7 +60,7 @@ class sparse_bitvector_analysist
 protected:
   typedef typename std::map<V, std::size_t> inner_mapt;
   std::vector<typename inner_mapt::const_iterator> values;
-  std::unordered_map<irep_idt, inner_mapt, irep_id_hash> value_map;
+  std::unordered_map<irep_idt, inner_mapt> value_map;
 };
 
 struct reaching_definitiont
@@ -191,15 +191,14 @@ class rd_range_domaint:public ai_domain_baset
   #ifdef USE_DSTRING
   typedef std::map<irep_idt, values_innert> valuest;
   #else
-  typedef std::unordered_map<irep_idt, values_innert, irep_id_hash> valuest;
+  typedef std::unordered_map<irep_idt, values_innert> valuest;
   #endif
   valuest values;
 
   #ifdef USE_DSTRING
   typedef std::map<irep_idt, ranges_at_loct> export_cachet;
   #else
-  typedef std::unordered_map<irep_idt, ranges_at_loct, irep_id_hash>
-    export_cachet;
+  typedef std::unordered_map<irep_idt, ranges_at_loct> export_cachet;
   #endif
   mutable export_cachet export_cache;
 

src/ansi-c/ansi_c_scope.h

@@ -41,8 +41,7 @@ class ansi_c_scopet
 public:
   // This maps "scope names" (tag-X, label-X, X) to
   // ansi_c_identifiert.
-  typedef std::unordered_map<irep_idt, ansi_c_identifiert, irep_id_hash>
-    name_mapt;
+  typedef std::unordered_map<irep_idt, ansi_c_identifiert> name_mapt;
   name_mapt name_map;
 
   std::string prefix;

src/ansi-c/c_typecheck_base.h

@@ -69,7 +69,7 @@ class c_typecheck_baset:
   const irep_idt mode;
   symbolt current_symbol;
 
-  typedef std::unordered_map<irep_idt, typet, irep_id_hash> id_type_mapt;
+  typedef std::unordered_map<irep_idt, typet> id_type_mapt;
   id_type_mapt parameter_map;
 
   // overload to use language specific syntax
@@ -270,7 +270,7 @@ class c_typecheck_baset:
            src.id()==ID_real;
   }
 
-  typedef std::unordered_map<irep_idt, irep_idt, irep_id_hash> asm_label_mapt;
+  typedef std::unordered_map<irep_idt, irep_idt> asm_label_mapt;
   asm_label_mapt asm_label_map;
 
   void apply_asm_label(const irep_idt &asm_label, symbolt &symbol);

src/ansi-c/c_typecheck_type.cpp

@@ -877,7 +877,7 @@ void c_typecheck_baset::typecheck_compound_body(
   // scan for duplicate members
 
   {
-    std::unordered_set<irep_idt, irep_id_hash> members;
+    std::unordered_set<irep_idt> members;
 
     for(struct_union_typet::componentst::iterator
         it=components.begin();

src/ansi-c/expr2c.cpp

@@ -1688,8 +1688,8 @@ std::string expr2ct::convert_symbol(
     dest=src.op0().get_string(ID_identifier);
   else
   {
-    std::unordered_map<irep_idt, irep_idt, irep_id_hash>::const_iterator
-      entry=shorthands.find(id);
+    std::unordered_map<irep_idt, irep_idt>::const_iterator entry =
+      shorthands.find(id);
     // we might be called from conversion of a type
     if(entry==shorthands.end())
     {

src/ansi-c/expr2c_class.h

@@ -64,10 +64,8 @@ class expr2ct
 
   static std::string indent_str(unsigned indent);
 
-  std::unordered_map<irep_idt,
-                std::unordered_set<irep_idt, irep_id_hash>,
-                irep_id_hash> ns_collision;
-  std::unordered_map<irep_idt, irep_idt, irep_id_hash> shorthands;
+  std::unordered_map<irep_idt, std::unordered_set<irep_idt>> ns_collision;
+  std::unordered_map<irep_idt, irep_idt> shorthands;
 
   unsigned sizeof_nesting;