Change the step at which we replace String methods code

We now do this at the end of the bytecode conversion, in function
java_bytecode_languaget::final instead of the middle of the
conversion.

Author: romainbrenguier

src/java_bytecode/java_bytecode_language.cpp

@@ -799,6 +799,36 @@ void java_bytecode_languaget::convert_lazy_method(
 
 /*******************************************************************\
 
+Function: java_bytecode_languaget::replace_string_methods
+
+  Inputs:
+    context - a symbol table
+
+ Purpose: Replace methods of the String library that are in the symbol table
+          by code generated by string_preprocess.
+
+\*******************************************************************/
+
+void java_bytecode_languaget::replace_string_methods(
+  symbol_tablet &context)
+{
+  for(auto &id_symbol_pair : context.symbols)
+  {
+    const irep_idt &id=id_symbol_pair.first;
+    symbolt &symbol=id_symbol_pair.second;
+    if(symbol.type.id()==ID_code)
+    {
+      exprt generated_code=string_preprocess.code_for_function(
+         id, to_code_type(symbol.type), symbol.location, context);
+      if(generated_code.is_not_nil())
+        // Replace body of the function by code generated by string preprocess
+        symbol.value=generated_code;
+    }
+  }
+}
+
+/*******************************************************************\
+
 Function: java_bytecode_languaget::final
 
   Inputs:
@@ -816,6 +846,9 @@ bool java_bytecode_languaget::final(symbol_tablet &symbol_table)
   */
   java_internal_additions(symbol_table);
 
+  // Replace code of String methods calls by code we generate
+  replace_string_methods(symbol_table);
+
   main_function_resultt res=
     get_main_symbol(symbol_table, main_class, get_message_handler());
   if(res.stop_convert)

src/java_bytecode/java_bytecode_language.h

@@ -49,6 +49,8 @@ class java_bytecode_languaget:public languaget
     symbol_tablet &context,
     const std::string &module) override;
 
+  void replace_string_methods(symbol_tablet &context);
+
   virtual bool final(
     symbol_tablet &context) override;