Fix breakage introduced during rebase

Author: reuk

src/java_bytecode/java_bytecode_convert_method.cpp

@@ -483,10 +483,6 @@ void java_bytecode_convert_methodt::convert(
   if((!m.is_abstract) && (!m.is_native))
     method_symbol.value=convert_instructions(m, code_type);
 
-#ifdef DEBUG
-  std::cerr << method_symbol.value.pretty() << '\n';
-#endif
-
   remove_assert_after_generic_nondet(method_symbol.value);
 
   // Replace the existing stub symbol with the real deal:

src/java_bytecode/java_bytecode_language.cpp

@@ -494,7 +494,8 @@ bool java_bytecode_languaget::typecheck(
          disable_runtime_checks,
          max_user_array_length,
          lazy_methods,
-         lazy_methods_mode))
+         lazy_methods_mode,
+         string_refinement_enabled))
       return true;
   }
 

src/java_bytecode/java_bytecode_typecheck.h

@@ -21,7 +21,8 @@ Author: Daniel Kroening, [email protected]
 
 bool java_bytecode_typecheck(
   symbol_tablet &symbol_table,
-  message_handlert &message_handler);
+  message_handlert &message_handler,
+  bool string_refinement_enabled);
 
 bool java_bytecode_typecheck(
   exprt &expr,
@@ -50,6 +51,7 @@ class java_bytecode_typecheckt:public typecheckt
 protected:
   symbol_tablet &symbol_table;
   const namespacet ns;
+  bool string_refinement_enabled;
 
   void typecheck_type_symbol(symbolt &);
   void typecheck_non_type_symbol(symbolt &);

src/java_bytecode/java_bytecode_typecheck_expr.cpp

@@ -22,17 +22,6 @@ Author: Daniel Kroening, [email protected]
 #include "java_pointer_casts.h"
 #include "java_types.h"
 
-java_bytecode_typecheckt::java_bytecode_typecheckt(
-  symbol_tablet &_symbol_table,
-  message_handlert &_message_handler,
-  size_t _max_nondet_array_length)
-  : typecheckt(_message_handler),
-    symbol_table(_symbol_table),
-    ns(symbol_table),
-    max_nondet_array_length(_max_nondet_array_length)
-{
-}
-
 /*******************************************************************\
 
 Function: java_bytecode_typecheckt::typecheck_expr