Use allocate_objectst in java string library preprocessing

Author: danpoe

jbmc/src/java_bytecode/java_string_library_preprocess.cpp

@@ -16,13 +16,14 @@ Date:   April 2017
 ///   java standard library. In particular methods from java.lang.String,
 ///   java.lang.StringBuilder, java.lang.StringBuffer.
 
+#include <util/allocate_objects.h>
 #include <util/arith_tools.h>
-#include <util/std_expr.h>
-#include <util/std_code.h>
+#include <util/c_types.h>
 #include <util/fresh_symbol.h>
 #include <util/refined_string_type.h>
+#include <util/std_code.h>
+#include <util/std_expr.h>
 #include <util/string_expr.h>
-#include <util/c_types.h>
 
 #include "java_types.h"
 #include "java_object_factory.h"
@@ -574,7 +575,11 @@ exprt java_string_library_preprocesst::allocate_fresh_string(
   code_blockt &code)
 {
   exprt str=fresh_string(type, loc, symbol_table);
-  allocate_dynamic_object_with_decl(str, symbol_table, loc, function_id, code);
+
+  allocate_objectst allocate_objects(ID_java, loc, function_id, symbol_table);
+
+  allocate_objects.allocate_dynamic_object_with_decl(code, str);
+
   return str;
 }
 
@@ -1366,8 +1371,11 @@ exprt java_string_library_preprocesst::make_argument_for_format(
     ID_java,
     symbol_table);
   symbol_exprt arg_i=object_symbol.symbol_expr();
-  allocate_dynamic_object_with_decl(
-    arg_i, symbol_table, loc, function_id, code);
+
+  allocate_objectst allocate_objects(ID_java, loc, function_id, symbol_table);
+
+  allocate_objects.allocate_dynamic_object_with_decl(code, arg_i);
+
   code.add(code_assignt(arg_i, obj), loc);
   code.add(
     code_assumet(