Don't store pointers to symbols in map

Author: NathanJPhillips

src/java_bytecode/ci_lazy_methods.cpp

@@ -149,7 +149,7 @@ bool ci_lazy_methodst::operator()(
         debug() << "CI lazy methods: elaborate " << mname << eom;
         const auto &parsed_method=findit->second;
         method_converter(
-          *parsed_method.first,
+          symbol_table.lookup_ref(parsed_method.first),
           *parsed_method.second,
           // Note this wraps *references* to method_worklist2 & needed_classes
           ci_lazy_methods_neededt(

src/java_bytecode/ci_lazy_methods.h

@@ -27,7 +27,7 @@
 class java_string_library_preprocesst;
 
 // Pair of class id and methodt
-typedef std::pair<const symbolt *, const java_bytecode_parse_treet::methodt *>
+typedef std::pair<irep_idt, const java_bytecode_parse_treet::methodt *>
   class_and_bytecodet;
 // Map from method id to class_and_bytecodet
 typedef std::map<irep_idt, class_and_bytecodet> method_bytecodet;

src/java_bytecode/java_bytecode_convert_class.cpp

@@ -205,7 +205,8 @@ void java_bytecode_convert_classt::convert(const classt &c)
       method,
       symbol_table,
       get_message_handler());
-    method_bytecode[method_identifier] = std::make_pair(class_symbol, &method);
+    method_bytecode[method_identifier] =
+      std::make_pair(qualified_classname, &method);
   }
 
   // is this a root class?

src/java_bytecode/java_bytecode_language.cpp

@@ -251,7 +251,7 @@ bool java_bytecode_languaget::typecheck(
     for(const auto &method_sig : method_bytecode)
     {
       java_bytecode_convert_method(
-        *method_sig.second.first,
+        symbol_table.lookup_ref(method_sig.second.first),
         *method_sig.second.second,
         symbol_table,
         get_message_handler(),
@@ -370,7 +370,7 @@ void java_bytecode_languaget::convert_lazy_method(
 {
   const auto &lazy_method_entry = method_bytecode.at(function_id);
   java_bytecode_convert_method(
-    *lazy_method_entry.first,
+    symbol_table.lookup_ref(lazy_method_entry.first),
     *lazy_method_entry.second,
     symbol_table,
     get_message_handler(),

src/java_bytecode/java_bytecode_language.h

@@ -82,7 +82,7 @@ struct object_factory_parameterst final
 };
 
 // Pair of class id and methodt
-typedef std::pair<const symbolt *, const java_bytecode_parse_treet::methodt *>
+typedef std::pair<irep_idt, const java_bytecode_parse_treet::methodt *>
   class_and_bytecodet;
 // Map from method id to class_and_bytecodet
 typedef std::map<irep_idt, class_and_bytecodet> method_bytecodet;