Remove redundant irep_id_hash for unordered maps

Owen Jones · Owen Jones · commit 5f3303a9e8c6 · 2018-04-19T17:01:09.000+01:00
diff --git a/src/analyses/call_graph.cpp b/src/analyses/call_graph.cpp
@@ -165,7 +165,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)
diff --git a/src/analyses/call_graph.h b/src/analyses/call_graph.h
@@ -115,7 +115,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
@@ -124,8 +124,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
diff --git a/src/analyses/invariant_propagation.cpp b/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)
diff --git a/src/analyses/reaching_definitions.h b/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;
 
diff --git a/src/ansi-c/ansi_c_scope.h b/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;
diff --git a/src/ansi-c/c_typecheck_base.h b/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);
diff --git a/src/ansi-c/expr2c.cpp b/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())
     {
diff --git a/src/ansi-c/expr2c_class.h b/src/ansi-c/expr2c_class.h
@@ -64,9 +64,8 @@ class expr2ct
 
   static std::string indent_str(unsigned indent);
 
-  std::unordered_map<irep_idt, std::unordered_set<irep_idt>, 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;
 
diff --git a/src/ansi-c/type2name.cpp b/src/ansi-c/type2name.cpp
@@ -19,8 +19,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #include <util/pointer_offset_size.h>
 #include <util/invariant.h>
 
-typedef std::unordered_map<irep_idt, std::pair<size_t, bool>, irep_id_hash>
-  symbol_numbert;
+typedef std::unordered_map<irep_idt, std::pair<size_t, bool>> symbol_numbert;
 
 static std::string type2name(
   const typet &type,
diff --git a/src/cbmc/symex_bmc.h b/src/cbmc/symex_bmc.h
@@ -112,7 +112,7 @@ class symex_bmct: public goto_symext
   unsigned max_unwind;
   bool max_unwind_is_set;
 
-  typedef std::unordered_map<irep_idt, unsigned, irep_id_hash> loop_limitst;
+  typedef std::unordered_map<irep_idt, unsigned> loop_limitst;
   loop_limitst loop_limits;
 
   typedef std::map<unsigned, loop_limitst> thread_loop_limitst;
diff --git a/src/cpp/cpp_scopes.h b/src/cpp/cpp_scopes.h
@@ -65,7 +65,7 @@ class cpp_scopest
   }
 
   // mapping from function/class/scope names to their cpp_idt
-  typedef std::unordered_map<irep_idt, cpp_idt *, irep_id_hash> id_mapt;
+  typedef std::unordered_map<irep_idt, cpp_idt *> id_mapt;
   id_mapt id_map;
 
   cpp_scopet *current_scope_ptr;
diff --git a/src/goto-instrument/count_eloc.cpp b/src/goto-instrument/count_eloc.cpp
@@ -22,8 +22,8 @@ Date: December 2012
 #include <goto-programs/cfg.h>
 
 typedef std::unordered_set<irep_idt> linest;
-typedef std::unordered_map<irep_idt, linest, irep_id_hash> filest;
-typedef std::unordered_map<irep_idt, filest, irep_id_hash> working_dirst;
+typedef std::unordered_map<irep_idt, linest> filest;
+typedef std::unordered_map<irep_idt, filest> working_dirst;
 
 static void collect_eloc(
   const goto_modelt &goto_model,
diff --git a/src/goto-instrument/cover_basic_blocks.h b/src/goto-instrument/cover_basic_blocks.h
@@ -125,7 +125,7 @@ class cover_basic_blocks_javat final : public cover_blocks_baset
   // map block number to its location
   std::vector<source_locationt> block_locations;
   // map java indexes to block indexes
-  std::unordered_map<irep_idt, std::size_t, irep_id_hash> index_to_block;
+  std::unordered_map<irep_idt, std::size_t> index_to_block;
 
 public:
   explicit cover_basic_blocks_javat(const goto_programt &_goto_program);
diff --git a/src/goto-instrument/dump_c.cpp b/src/goto-instrument/dump_c.cpp
@@ -87,7 +87,7 @@ void dump_ct::operator()(std::ostream &os)
     copied_symbol_table.add(symbol_pair.second);
   }
 
-  typedef std::unordered_map<irep_idt, unsigned, irep_id_hash> unique_tagst;
+  typedef std::unordered_map<irep_idt, unsigned> unique_tagst;
   unique_tagst unique_tags;
 
   // add tags to anonymous union/struct/enum,
@@ -770,8 +770,8 @@ void dump_ct::dump_typedefs(std::ostream &os) const
   std::map<std::string, typedef_infot> to_insert;
 
   std::unordered_set<irep_idt> typedefs_done;
-  std::unordered_map<irep_idt, std::unordered_set<irep_idt>, irep_id_hash>
-    forward_deps, reverse_deps;
+  std::unordered_map<irep_idt, std::unordered_set<irep_idt>> forward_deps,
+    reverse_deps;
 
   for(const auto &td : typedef_map)
     if(!td.second.type_decl_str.empty())
diff --git a/src/goto-instrument/dump_c_class.h b/src/goto-instrument/dump_c_class.h
@@ -59,8 +59,7 @@ class dump_ct
 
   system_library_symbolst system_symbols;
 
-  typedef std::unordered_map<irep_idt, irep_idt, irep_id_hash>
-    declared_enum_constants_mapt;
+  typedef std::unordered_map<irep_idt, irep_idt> declared_enum_constants_mapt;
   declared_enum_constants_mapt declared_enum_constants;
 
   struct typedef_infot
@@ -129,8 +128,7 @@ class dump_ct
     const typet &type,
     std::ostream &os);
 
-  typedef std::unordered_map<irep_idt, code_declt, irep_id_hash>
-          local_static_declst;
+  typedef std::unordered_map<irep_idt, code_declt> local_static_declst;
 
   void convert_global_variable(
       const symbolt &symbol,
diff --git a/src/goto-instrument/full_slicer_class.h b/src/goto-instrument/full_slicer_class.h
@@ -62,7 +62,7 @@ class full_slicert
   typedef std::vector<cfgt::entryt> dep_node_to_cfgt;
   typedef std::stack<cfgt::entryt> queuet;
   typedef std::list<cfgt::entryt> jumpst;
-  typedef std::unordered_map<irep_idt, queuet, irep_id_hash> decl_deadt;
+  typedef std::unordered_map<irep_idt, queuet> decl_deadt;
 
   void fixedpoint(
     goto_functionst &goto_functions,
diff --git a/src/goto-instrument/goto_program2code.h b/src/goto-instrument/goto_program2code.h
@@ -22,7 +22,7 @@ class goto_program2codet
   typedef std::list<irep_idt> id_listt;
   typedef std::map<goto_programt::const_targett, goto_programt::const_targett>
     loopt;
-  typedef std::unordered_map<irep_idt, unsigned, irep_id_hash> dead_mapt;
+  typedef std::unordered_map<irep_idt, unsigned> dead_mapt;
   typedef std::list<std::pair<goto_programt::const_targett, bool> >
     loop_last_stackt;
 
diff --git a/src/goto-instrument/rw_set.h b/src/goto-instrument/rw_set.h
@@ -53,7 +53,7 @@ class rw_set_baset
     }
   };
 
-  typedef std::unordered_map<irep_idt, entryt, irep_id_hash> entriest;
+  typedef std::unordered_map<irep_idt, entryt> entriest;
   entriest r_entries, w_entries;
 
   void swap(rw_set_baset &other)
diff --git a/src/goto-programs/class_hierarchy.h b/src/goto-programs/class_hierarchy.h
@@ -75,8 +75,7 @@ class class_hierarchy_grapht : public grapht<class_hierarchy_graph_nodet>
 {
 public:
   /// Maps class identifiers onto node indices
-  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;
 
   void populate(const symbol_tablet &);
 
diff --git a/src/goto-programs/interpreter_class.h b/src/goto-programs/interpreter_class.h
@@ -104,7 +104,7 @@ class interpretert:public messaget
 
   const goto_functionst &goto_functions;
 
-  typedef std::unordered_map<irep_idt, mp_integer, irep_id_hash> memory_mapt;
+  typedef std::unordered_map<irep_idt, mp_integer> memory_mapt;
   typedef std::map<mp_integer, irep_idt> inverse_memory_mapt;
   memory_mapt memory_map;
   inverse_memory_mapt inverse_memory_map;
diff --git a/src/goto-programs/string_abstraction.cpp b/src/goto-programs/string_abstraction.cpp
@@ -252,8 +252,7 @@ void string_abstractiont::abstract(goto_programt &dest)
 
 void string_abstractiont::declare_define_locals(goto_programt &dest)
 {
-  typedef std::unordered_map<irep_idt, goto_programt::targett, irep_id_hash>
-    available_declst;
+  typedef std::unordered_map<irep_idt, goto_programt::targett> available_declst;
   available_declst available_decls;
 
   Forall_goto_program_instructions(it, dest)
diff --git a/src/goto-programs/string_abstraction.h b/src/goto-programs/string_abstraction.h
@@ -134,7 +134,7 @@ class string_abstractiont:public messaget
   typet string_struct;
   goto_programt initialization;
 
-  typedef std::unordered_map<irep_idt, irep_idt, irep_id_hash> localst;
+  typedef std::unordered_map<irep_idt, irep_idt> localst;
   localst locals;
 
   void abstract(goto_programt &dest);
diff --git a/src/goto-symex/goto_symex_state.h b/src/goto-symex/goto_symex_state.h
@@ -192,7 +192,7 @@ class goto_symex_statet final
   void get_l1_name(exprt &expr) const;
 
   // this maps L1 names to (L2) types
-  typedef std::unordered_map<irep_idt, typet, irep_id_hash> l1_typest;
+  typedef std::unordered_map<irep_idt, typet> l1_typest;
   l1_typest l1_types;
 
 public:
@@ -298,8 +298,7 @@ class goto_symex_statet final
       unsigned count;
       bool is_recursion;
     };
-    typedef std::unordered_map<irep_idt, loop_infot, irep_id_hash>
-      loop_iterationst;
+    typedef std::unordered_map<irep_idt, loop_infot> loop_iterationst;
     loop_iterationst loop_iterations;
   };
 
diff --git a/src/java_bytecode/character_refine_preprocess.h b/src/java_bytecode/character_refine_preprocess.h
@@ -36,8 +36,7 @@ class character_refine_preprocesst:public messaget
   typedef const code_function_callt &conversion_inputt;
   typedef codet (*conversion_functiont)(conversion_inputt &target);
   // A table tells us what method to call for each java method signature
-  std::unordered_map<irep_idt, conversion_functiont, irep_id_hash>
-    conversion_table;
+  std::unordered_map<irep_idt, conversion_functiont> conversion_table;
 
   // Conversion functions
   static exprt expr_of_char_count(const exprt &chr, const typet &type);
diff --git a/src/java_bytecode/java_static_initializers.h b/src/java_bytecode/java_static_initializers.h
@@ -31,8 +31,7 @@ codet get_clinit_wrapper_body(
 class stub_global_initializer_factoryt
 {
   /// Maps class symbols onto the stub globals that belong to them
-  typedef std::unordered_multimap<irep_idt, irep_idt, irep_id_hash>
-    stub_globals_by_classt;
+  typedef std::unordered_multimap<irep_idt, irep_idt> stub_globals_by_classt;
   stub_globals_by_classt stub_globals_by_class;
 
 public:
diff --git a/src/java_bytecode/java_string_library_preprocess.h b/src/java_bytecode/java_string_library_preprocess.h
@@ -105,11 +105,10 @@ class java_string_library_preprocesst:public messaget
     symbol_table_baset &)>
     conversion_functiont;
 
-  typedef std::unordered_map<irep_idt, irep_idt, irep_id_hash> id_mapt;
+  typedef std::unordered_map<irep_idt, irep_idt> id_mapt;
 
   // Table mapping each java method signature to the code generating function
-  std::unordered_map<irep_idt, conversion_functiont, irep_id_hash>
-    conversion_table;
+  std::unordered_map<irep_idt, conversion_functiont> conversion_table;
 
   // Some Java functions have an equivalent in the solver that we will
   // call with the same argument and will return the same result
diff --git a/src/java_bytecode/select_pointer_type.h b/src/java_bytecode/select_pointer_type.h
@@ -16,7 +16,7 @@
 #include <stack>
 #include "java_types.h"
 
-typedef std::unordered_map<irep_idt, std::stack<reference_typet>, irep_id_hash>
+typedef std::unordered_map<irep_idt, std::stack<reference_typet>>
   generic_parameter_specialization_mapt;
 
 class namespacet;
diff --git a/src/java_bytecode/synthetic_methods_map.h b/src/java_bytecode/synthetic_methods_map.h
@@ -34,7 +34,7 @@ enum class synthetic_method_typet
 };
 
 /// Maps method names on to a synthetic method kind.
-typedef std::unordered_map<irep_idt, synthetic_method_typet, irep_id_hash>
+typedef std::unordered_map<irep_idt, synthetic_method_typet>
   synthetic_methods_mapt;
 
 #endif
diff --git a/src/linking/linking_class.h b/src/linking/linking_class.h
@@ -171,10 +171,7 @@ class linkingt:public typecheckt
   namespacet ns;
 
   // X -> Y iff Y uses X for new symbol type IDs X and Y
-  typedef std::unordered_map<irep_idt,
-                             std::unordered_set<irep_idt>,
-                             irep_id_hash>
-    used_byt;
+  typedef std::unordered_map<irep_idt, std::unordered_set<irep_idt>> used_byt;
 
   irep_idt rename(irep_idt);
 
diff --git a/src/pointer-analysis/value_set_analysis_fi.cpp b/src/pointer-analysis/value_set_analysis_fi.cpp
@@ -47,7 +47,7 @@ void value_set_analysis_fit::add_vars(
   goto_program.get_decl_identifiers(locals);
 
   // cache the list for the locals to speed things up
-  typedef std::unordered_map<irep_idt, entry_listt, irep_id_hash> entry_cachet;
+  typedef std::unordered_map<irep_idt, entry_listt> entry_cachet;
   entry_cachet entry_cache;
 
   value_set_fit &v=state.value_set;
diff --git a/src/pointer-analysis/value_set_analysis_fivr.cpp b/src/pointer-analysis/value_set_analysis_fivr.cpp
@@ -47,7 +47,7 @@ void value_set_analysis_fivrt::add_vars(
   goto_program.get_decl_identifiers(locals);
 
   // cache the list for the locals to speed things up
-  typedef std::unordered_map<irep_idt, entry_listt, irep_id_hash> entry_cachet;
+  typedef std::unordered_map<irep_idt, entry_listt> entry_cachet;
   entry_cachet entry_cache;
 
   value_set_fivrt &v=state.value_set;
diff --git a/src/pointer-analysis/value_set_analysis_fivrns.cpp b/src/pointer-analysis/value_set_analysis_fivrns.cpp
@@ -47,7 +47,7 @@ void value_set_analysis_fivrnst::add_vars(
   goto_program.get_decl_identifiers(locals);
 
   // cache the list for the locals to speed things up
-  typedef std::unordered_map<irep_idt, entry_listt, irep_id_hash> entry_cachet;
+  typedef std::unordered_map<irep_idt, entry_listt> entry_cachet;
   entry_cachet entry_cache;
 
   value_set_fivrnst &v=state.value_set;
diff --git a/src/solvers/cvc/cvc_conv.h b/src/solvers/cvc/cvc_conv.h
@@ -55,8 +55,7 @@ class cvc_convt:public prop_convt
     }
   };
 
-  typedef std::unordered_map<irep_idt, identifiert, irep_id_hash>
-    identifier_mapt;
+  typedef std::unordered_map<irep_idt, identifiert> identifier_mapt;
 
   identifier_mapt identifier_map;
 
diff --git a/src/solvers/flattening/boolbv_map.h b/src/solvers/flattening/boolbv_map.h
diff --git a/src/solvers/smt1/smt1_conv.h b/src/solvers/smt1/smt1_conv.h
diff --git a/src/solvers/smt2/smt2_conv.h b/src/solvers/smt2/smt2_conv.h
diff --git a/src/solvers/smt2/smt2_dec.cpp b/src/solvers/smt2/smt2_dec.cpp
diff --git a/src/util/rename_symbol.h b/src/util/rename_symbol.h
diff --git a/src/util/replace_symbol.h b/src/util/replace_symbol.h
diff --git a/src/util/std_types.h b/src/util/std_types.h
diff --git a/src/util/symbol_table_base.h b/src/util/symbol_table_base.h

Original file line number	Diff line number	Diff line change
`@@ -1688,8 +1688,8 @@ std::string expr2ct::convert_symbol(`
`1688`	`1688`	`dest=src.op0().get_string(ID_identifier);`
`1689`	`1689`	`else`
`1690`	`1690`	`{`
`1691`		`- std::unordered_map<irep_idt, irep_idt, irep_id_hash>::const_iterator`
`1692`		`- entry=shorthands.find(id);`
	`1691`	`+ std::unordered_map<irep_idt, irep_idt>::const_iterator entry =`
	`1692`	`+ shorthands.find(id);`
`1693`	`1693`	`// we might be called from conversion of a type`
`1694`	`1694`	`if(entry==shorthands.end())`
`1695`	`1695`	`{`