Use id_sett instead of std::set<irep_idt>

Author: Owen Jones

src/java_bytecode/ci_lazy_methods.cpp

@@ -107,7 +107,7 @@ bool ci_lazy_methodst::operator()(
   methods_to_convert_later.insert(
     extra_entry_points.begin(), extra_entry_points.end());
 
-  std::set<irep_idt> instantiated_classes;
+  id_sett instantiated_classes;
 
   {
     id_sett initial_callable_methods;
@@ -119,7 +119,7 @@ bool ci_lazy_methodst::operator()(
       initial_callable_methods.begin(), initial_callable_methods.end());
   }
 
-  std::set<irep_idt> methods_already_populated;
+  id_sett methods_already_populated;
   std::unordered_set<exprt, irep_hash> virtual_function_calls;
 
   bool any_new_methods=true;
@@ -399,7 +399,7 @@ void ci_lazy_methodst::gather_virtual_callsites(
 /// \param symbol_table: global symbol table
 void ci_lazy_methodst::get_virtual_method_targets(
   const exprt &called_function,
-  const std::set<irep_idt> &instantiated_classes,
+  const id_sett &instantiated_classes,
   id_sett &callable_methods,
   symbol_tablet &symbol_table)
 {
@@ -528,7 +528,7 @@ void ci_lazy_methodst::gather_field_types(
 ///   `call_basename` if found and `classname` is present in
 ///   `instantiated_classes`, or irep_idt() otherwise.
 irep_idt ci_lazy_methodst::get_virtual_method_target(
-  const std::set<irep_idt> &instantiated_classes,
+  const id_sett &instantiated_classes,
   const irep_idt &call_basename,
   const irep_idt &classname,
   const symbol_tablet &symbol_table)

src/java_bytecode/ci_lazy_methods.h

@@ -135,7 +135,7 @@ class ci_lazy_methodst:public messaget
 
   void get_virtual_method_targets(
     const exprt &called_function,
-    const std::set<irep_idt> &instantiated_classes,
+    const id_sett &instantiated_classes,
     id_sett &callable_methods,
     symbol_tablet &symbol_table);
 
@@ -150,7 +150,7 @@ class ci_lazy_methodst:public messaget
     ci_lazy_methods_neededt &needed_lazy_methods);
 
   irep_idt get_virtual_method_target(
-    const std::set<irep_idt> &instantiated_classes,
+    const id_sett &instantiated_classes,
     const irep_idt &call_basename,
     const irep_idt &classname,
     const symbol_tablet &symbol_table);

src/java_bytecode/ci_lazy_methods_needed.h

@@ -21,7 +21,7 @@ class ci_lazy_methods_neededt
 public:
   ci_lazy_methods_neededt(
     id_sett &_callable_methods,
-    std::set<irep_idt> &_instantiated_classes,
+    id_sett &_instantiated_classes,
     symbol_tablet &_symbol_table):
   callable_methods(_callable_methods),
   instantiated_classes(_instantiated_classes),
@@ -42,7 +42,7 @@ class ci_lazy_methods_neededt
   // instantiated_classes on the other hand is a true set of every class
   // found so far, so we can use a membership test to avoid
   // repeatedly exploring a class hierarchy.
-  std::set<irep_idt> &instantiated_classes;
+  id_sett &instantiated_classes;
   symbol_tablet &symbol_table;
 };