Pass lambda method handles to method instruction conversion cont.

Author: svorenova

src/java_bytecode/java_bytecode_convert_method.cpp

@@ -306,22 +306,20 @@ code_typet member_type_lazy(
 /// Retrieves the symbol of the lambda method associated with the given
 /// lambda method handle (bootstrap method).
 /// \param lambda_method_handles Vector of lambda method handles (bootstrap
-/// methods) of the class where the lambda is called
+///   methods) of the class where the lambda is called
 /// \param index Index of the lambda method handle in the vector
 /// \return Symbol of the lambda method if the method handle does not have an
-/// unknown type
+///   unknown type
 optionalt<symbolt> java_bytecode_convert_methodt::get_lambda_method_symbol(
   const java_class_typet::java_lambda_method_handlest &lambda_method_handles,
-  const irep_idt &index)
+  const size_t &index)
 {
-  const symbol_exprt &lambda_method_handle =
-    lambda_method_handles.at(std::stoi(id2string(index)));
+  const symbol_exprt &lambda_method_handle = lambda_method_handles.at(index);
   // If the lambda method handle has an unknown type, it does not refer to
   // any symbol (it is a symbol expression with empty identifier)
   if(!lambda_method_handle.get_identifier().empty())
     return symbol_table.lookup_ref(lambda_method_handle.get_identifier());
-  else
-    return {};
+  return {};
 }
 
 /// This creates a method symbol in the symtab, but doesn't actually perform
@@ -1238,7 +1236,7 @@ codet java_bytecode_convert_methodt::convert_instructions(
 
       const optionalt<symbolt> &lambda_method_symbol = get_lambda_method_symbol(
         lambda_method_handles,
-        code_type.get(ID_java_lambda_method_handle_index));
+        code_type.get_int(ID_java_lambda_method_handle_index));
       if(lambda_method_symbol.has_value())
         debug() << "Converting invokedynamic for lambda: "
                 << lambda_method_symbol.value().name << eom;

src/java_bytecode/java_bytecode_convert_method_class.h

@@ -237,7 +237,7 @@ class java_bytecode_convert_methodt:public messaget
 
   optionalt<symbolt> get_lambda_method_symbol(
     const java_class_typet::java_lambda_method_handlest &lambda_method_handles,
-    const irep_idt &index);
+    const size_t &index);
 
   // conversion
   void convert(const symbolt &class_symbol, const methodt &);