Make class_to_declared_symbols take multimap argument

This is an intermediary commit that gets us closer to avoiding
recomputing this map everytime.

Author: romainbrenguier

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -1218,13 +1218,16 @@ bool java_bytecode_languaget::convert_single_method(
         class_name, "user_specified_clinit must be declared by a class.");
       INVARIANT(
         static_values_json.has_value(), "static-values JSON must be available");
+      const auto class_to_declared_symbols_map =
+        class_to_declared_symbols(symbol_table);
       writable_symbol.value = get_user_specified_clinit_body(
         *class_name,
         *static_values_json,
         symbol_table,
         needed_lazy_methods,
         max_user_array_length,
-        references);
+        references,
+        class_to_declared_symbols_map);
       break;
     }
     case synthetic_method_typet::STUB_CLASS_STATIC_INITIALIZER:

jbmc/src/java_bytecode/java_static_initializers.cpp

@@ -768,7 +768,7 @@ code_ifthenelset get_clinit_wrapper_body(
 }
 
 /// \return map associating classes to the symbols they declare
-static std::unordered_multimap<irep_idt, symbolt>
+std::unordered_multimap<irep_idt, symbolt>
 class_to_declared_symbols(const symbol_tablet &symbol_table)
 {
   std::unordered_multimap<irep_idt, symbolt> result;
@@ -787,7 +787,9 @@ code_blockt get_user_specified_clinit_body(
   symbol_table_baset &symbol_table,
   optionalt<ci_lazy_methods_neededt> needed_lazy_methods,
   size_t max_user_array_length,
-  std::unordered_map<std::string, object_creation_referencet> &references)
+  std::unordered_map<std::string, object_creation_referencet> &references,
+  const std::unordered_multimap<irep_idt, symbolt>
+    &class_to_declared_symbols_map)
 {
   const irep_idt &real_clinit_name = clinit_function_name(class_id);
   const auto class_entry =
@@ -799,8 +801,6 @@ code_blockt get_user_specified_clinit_body(
     {
       const auto &class_json_object = to_json_object(class_json_value);
       std::map<symbol_exprt, jsont> static_field_values;
-      const auto class_to_declared_symbols_map =
-        class_to_declared_symbols(symbol_table);
       for(const auto &class_symbol_pair :
           equal_range(class_to_declared_symbols_map, class_id))
       {

jbmc/src/java_bytecode/java_static_initializers.h

@@ -52,6 +52,10 @@ code_ifthenelset get_clinit_wrapper_body(
   const select_pointer_typet &pointer_type_selector,
   message_handlert &message_handler);
 
+/// \return map associating classes to the symbols they declare
+std::unordered_multimap<irep_idt, symbolt>
+class_to_declared_symbols(const symbol_tablet &symbol_table);
+
 /// Create the body of a user_specified_clinit function for a given class, which
 /// includes assignments for all static fields of the class to values read from
 /// an input file. If the file could not be parsed or an entry for this class
@@ -72,14 +76,18 @@ code_ifthenelset get_clinit_wrapper_body(
 ///   arrays. Any arrays that were specified to be of nondeterministic length in
 ///   the input file will be limited by this value.
 /// \param references: map to keep track of reference-equal objets.
+/// \param class_to_declared_symbols_map: map classes to the symbols that
+///   they declare.
 /// \return the body of the user_specified_clinit function as a code block.
 code_blockt get_user_specified_clinit_body(
   const irep_idt &class_id,
   const json_objectt &static_values_json,
   symbol_table_baset &symbol_table,
   optionalt<ci_lazy_methods_neededt> needed_lazy_methods,
   size_t max_user_array_length,
-  std::unordered_map<std::string, object_creation_referencet> &references);
+  std::unordered_map<std::string, object_creation_referencet> &references,
+  const std::unordered_multimap<irep_idt, symbolt>
+    &class_to_declared_symbols_map);
 
 class stub_global_initializer_factoryt
 {