Move method for gathering all instantiated types into ci_lazy_methods_needed

Author: thk123

jbmc/src/java_bytecode/ci_lazy_methods.cpp

@@ -113,7 +113,7 @@ bool ci_lazy_methodst::operator()(
   {
     std::unordered_set<irep_idt> initial_callable_methods;
     ci_lazy_methods_neededt initial_lazy_methods(
-      initial_callable_methods, instantiated_classes, symbol_table);
+      initial_callable_methods, instantiated_classes, symbol_table, pointer_type_selector);
     initialize_instantiated_classes(
       methods_to_convert_later, namespacet(symbol_table), initial_lazy_methods);
     methods_to_convert_later.insert(
@@ -278,7 +278,7 @@ ci_lazy_methodst::convert_and_analyze_method(
   // Note this wraps *references* to methods_to_convert_later &
   // instantiated_classes
   ci_lazy_methods_neededt needed_methods(
-    methods_to_convert_later, instantiated_classes, symbol_table);
+    methods_to_convert_later, instantiated_classes, symbol_table, pointer_type_selector);
 
   const bool could_not_convert_function =
     method_converter(mname, needed_methods);
@@ -410,8 +410,7 @@ void ci_lazy_methodst::initialize_instantiated_classes(
       if(param.type().id()==ID_pointer)
       {
         const pointer_typet &original_pointer=to_pointer_type(param.type());
-        initialize_all_instantiated_classes_from_pointer(
-          original_pointer, ns, needed_lazy_methods);
+        needed_lazy_methods.add_all_needed_classes(original_pointer);
       }
     }
   }
@@ -428,75 +427,6 @@ void ci_lazy_methodst::initialize_instantiated_classes(
     needed_lazy_methods.add_needed_class("java::" + id2string(id));
 }
 
-/// Build up list of methods for types for a pointer and any types it
-/// might be subsituted for. See
-/// `initialize_instantiated_classes` for more details.
-/// \param pointer_type: The type to gather methods for.
-/// \param ns: global namespace
-/// \param [out] needed_lazy_methods: Populated with all Java reference types
-///   whose references may be passed, directly or indirectly, to any of the
-///   functions in `entry_points`
-void ci_lazy_methodst::initialize_all_instantiated_classes_from_pointer(
-  const pointer_typet &pointer_type,
-  const namespacet &ns,
-  ci_lazy_methods_neededt &needed_lazy_methods)
-{
-  initialize_instantiated_classes_from_pointer(
-    pointer_type,
-    ns,
-    needed_lazy_methods);
-
-  // TODO we should be passing here a map that maps generic parameters
-  // to concrete types in the current context TG-2664
-  const pointer_typet &subbed_pointer_type =
-    pointer_type_selector.convert_pointer_type(pointer_type, {}, ns);
-
-  if(subbed_pointer_type!=pointer_type)
-  {
-    initialize_instantiated_classes_from_pointer(
-      subbed_pointer_type, ns, needed_lazy_methods);
-  }
-}
-
-/// Build up list of methods for types for a specific pointer type. See
-/// `initialize_instantiated_classes` for more details.
-/// \param pointer_type: The type to gather methods for.
-/// \param ns: global namespace
-/// \param [out] needed_lazy_methods: Populated with all Java reference types
-///   whose references may be passed, directly or indirectly, to any of the
-///   functions in `entry_points`
-void ci_lazy_methodst::initialize_instantiated_classes_from_pointer(
-  const pointer_typet &pointer_type,
-  const namespacet &ns,
-  ci_lazy_methods_neededt &needed_lazy_methods)
-{
-  const symbol_typet &class_type=to_symbol_type(pointer_type.subtype());
-  const auto &param_classid=class_type.get_identifier();
-
-  // Note here: different arrays may have different element types, so we should
-  // explore again even if we've seen this classid before in the array case.
-  if(needed_lazy_methods.add_needed_class(param_classid) ||
-     is_java_array_tag(param_classid))
-  {
-    gather_field_types(pointer_type.subtype(), ns, needed_lazy_methods);
-  }
-
-  if(is_java_generic_type(pointer_type))
-  {
-    // Assume if this is a generic like X<A, B, C>, then any concrete parameters
-    // will at some point be instantiated.
-    const auto &generic_args =
-      to_java_generic_type(pointer_type).generic_type_arguments();
-    for(const auto &generic_arg : generic_args)
-    {
-      if(!is_java_generic_parameter(generic_arg))
-      {
-        initialize_instantiated_classes_from_pointer(
-          generic_arg, ns, needed_lazy_methods);
-      }
-    }
-  }
-}
 
 /// Get places where virtual functions are called.
 /// \param e: expression tree to search
@@ -591,64 +521,6 @@ void ci_lazy_methodst::gather_needed_globals(
       gather_needed_globals(*opit, symbol_table, needed);
 }
 
-/// See param needed_lazy_methods
-/// \param class_type: root of class tree to search
-/// \param ns: global namespace
-/// \param [out] needed_lazy_methods: Popualted with all Java reference types
-///   reachable starting at `class_type`. For example if `class_type` is
-///   `symbol_typet("java::A")` and A has a B field, then `B` (but not `A`) will
-///   noted as a needed class.
-void ci_lazy_methodst::gather_field_types(
-  const typet &class_type,
-  const namespacet &ns,
-  ci_lazy_methods_neededt &needed_lazy_methods)
-{
-  const auto &underlying_type=to_struct_type(ns.follow(class_type));
-  if(is_java_array_tag(underlying_type.get_tag()))
-  {
-    // If class_type is not a symbol this may be a reference array,
-    // but we can't tell what type.
-    if(class_type.id() == ID_symbol)
-    {
-      const typet &element_type =
-        java_array_element_type(to_symbol_type(class_type));
-      if(element_type.id() == ID_pointer)
-      {
-        // This is a reference array -- mark its element type available.
-        initialize_all_instantiated_classes_from_pointer(
-          to_pointer_type(element_type), ns, needed_lazy_methods);
-      }
-    }
-  }
-  else
-  {
-    for(const auto &field : underlying_type.components())
-    {
-      if(field.type().id() == ID_struct || field.type().id() == ID_symbol)
-        gather_field_types(field.type(), ns, needed_lazy_methods);
-      else if(field.type().id() == ID_pointer)
-      {
-        if(field.type().subtype().id() == ID_symbol)
-        {
-          initialize_all_instantiated_classes_from_pointer(
-            to_pointer_type(field.type()), ns, needed_lazy_methods);
-        }
-        else
-        {
-          // If raw structs were possible this would lead to missed
-          // dependencies, as both array element and specialised generic type
-          // information cannot be obtained in this case.
-          // We should therefore only be skipping pointers such as the uint16t*
-          // in our internal String representation.
-          INVARIANT(
-            field.type().subtype().id() != ID_struct,
-            "struct types should be referred to by symbol at this stage");
-        }
-      }
-    }
-  }
-}
-
 /// Find a virtual callee, if one is defined and the callee type is known to
 /// exist.
 /// \param instantiated_classes: set of classes that can be instantiated.

jbmc/src/java_bytecode/ci_lazy_methods.h

@@ -121,16 +121,6 @@ class ci_lazy_methodst:public messaget
     const namespacet &ns,
     ci_lazy_methods_neededt &needed_lazy_methods);
 
-  void initialize_all_instantiated_classes_from_pointer(
-    const pointer_typet &pointer_type,
-    const namespacet &ns,
-    ci_lazy_methods_neededt &needed_lazy_methods);
-
-  void initialize_instantiated_classes_from_pointer(
-    const pointer_typet &pointer_type,
-    const namespacet &ns,
-    ci_lazy_methods_neededt &needed_lazy_methods);
-
   void gather_virtual_callsites(
     const exprt &e,
     std::unordered_set<exprt, irep_hash> &result);
@@ -146,11 +136,6 @@ class ci_lazy_methodst:public messaget
     const symbol_tablet &symbol_table,
     symbol_tablet &needed);
 
-  void gather_field_types(
-    const typet &class_type,
-    const namespacet &ns,
-    ci_lazy_methods_neededt &needed_lazy_methods);
-
   irep_idt get_virtual_method_target(
     const std::unordered_set<irep_idt> &instantiated_classes,
     const irep_idt &call_basename,

jbmc/src/java_bytecode/ci_lazy_methods_needed.cpp

@@ -12,6 +12,9 @@ Author: Chris Smowton, [email protected]
 #include "ci_lazy_methods.h"
 
 #include <string>
+#include <util/namespace.h>
+#include <util/std_types.h>
+#include <java_bytecode/select_pointer_type.h>
 
 /// Notes `method_symbol_name` is referenced from some reachable function, and
 /// should therefore be elaborated.
@@ -41,3 +44,114 @@ bool ci_lazy_methods_neededt::add_needed_class(
 
   return true;
 }
+
+/// Add to the needed classes all class specified, the replacement type if it
+/// will be replaced, and all feilds it contains.
+/// \param pointer_type: The type to add
+void ci_lazy_methods_neededt::add_all_needed_classes(const pointer_typet &pointer_type)
+{
+  namespacet ns{symbol_table};
+  initialize_instantiated_classes_from_pointer(
+    pointer_type,
+    ns);
+
+  // TODO we should be passing here a map that maps generic parameters
+  // to concrete types in the current context TG-2664
+  const pointer_typet &subbed_pointer_type =
+    pointer_type_selector.convert_pointer_type(pointer_type, {}, ns);
+
+  if(subbed_pointer_type!=pointer_type)
+  {
+    initialize_instantiated_classes_from_pointer(
+      subbed_pointer_type, ns);
+  }
+}
+
+/// Build up list of methods for types for a specific pointer type. See
+/// `add_all_needed_classes` for more details.
+/// \param pointer_type: The type to gather methods for.
+/// \param ns: global namespace
+void ci_lazy_methods_neededt::initialize_instantiated_classes_from_pointer(
+  const pointer_typet &pointer_type,
+  const namespacet &ns)
+{
+  const symbol_typet &class_type=to_symbol_type(pointer_type.subtype());
+  const auto &param_classid=class_type.get_identifier();
+
+  // Note here: different arrays may have different element types, so we should
+  // explore again even if we've seen this classid before in the array case.
+  if(add_needed_class(param_classid) ||
+     is_java_array_tag(param_classid))
+  {
+    gather_field_types(pointer_type.subtype(), ns);
+  }
+
+  if(is_java_generic_type(pointer_type))
+  {
+    // Assume if this is a generic like X<A, B, C>, then any concrete parameters
+    // will at some point be instantiated.
+    const auto &generic_args =
+      to_java_generic_type(pointer_type).generic_type_arguments();
+    for(const auto &generic_arg : generic_args)
+    {
+      if(!is_java_generic_parameter(generic_arg))
+      {
+        initialize_instantiated_classes_from_pointer(
+          generic_arg, ns);
+      }
+    }
+  }
+}
+
+/// For a given type, gather all fields referenced by that type
+/// \param class_type: root of class tree to search
+/// \param ns: global namespaces.
+void ci_lazy_methods_neededt::gather_field_types(
+  const typet &class_type,
+  const namespacet &ns)
+{
+  const auto &underlying_type=to_struct_type(ns.follow(class_type));
+  if(is_java_array_tag(underlying_type.get_tag()))
+  {
+    // If class_type is not a symbol this may be a reference array,
+    // but we can't tell what type.
+    if(class_type.id() == ID_symbol)
+    {
+      const typet &element_type =
+        java_array_element_type(to_symbol_type(class_type));
+      if(element_type.id() == ID_pointer)
+      {
+        // This is a reference array -- mark its element type available.
+        add_all_needed_classes(
+          to_pointer_type(element_type));
+      }
+    }
+  }
+  else
+  {
+    for(const auto &field : underlying_type.components())
+    {
+      if(field.type().id() == ID_struct || field.type().id() == ID_symbol)
+        gather_field_types(field.type(), ns);
+      else if(field.type().id() == ID_pointer)
+      {
+        if(field.type().subtype().id() == ID_symbol)
+        {
+          add_all_needed_classes(
+            to_pointer_type(field.type()));
+        }
+        else
+        {
+          // If raw structs were possible this would lead to missed
+          // dependencies, as both array element and specialised generic type
+          // information cannot be obtained in this case.
+          // We should therefore only be skipping pointers such as the uint16t*
+          // in our internal String representation.
+          INVARIANT(
+            field.type().subtype().id() != ID_struct,
+            "struct types should be referred to by symbol at this stage");
+        }
+      }
+    }
+  }
+}

jbmc/src/java_bytecode/ci_lazy_methods_needed.h

@@ -17,22 +17,30 @@ Author: Chris Smowton, [email protected]
 #include <unordered_set>
 #include <util/symbol_table.h>
 
+
+class select_pointer_typet;
+class pointer_typet;
+
 class ci_lazy_methods_neededt
 {
 public:
   ci_lazy_methods_neededt(
     std::unordered_set<irep_idt> &_callable_methods,
     std::unordered_set<irep_idt> &_instantiated_classes,
-    symbol_tablet &_symbol_table)
+    symbol_tablet &_symbol_table,
+    const select_pointer_typet &pointer_type_selector)
     : callable_methods(_callable_methods),
       instantiated_classes(_instantiated_classes),
-      symbol_table(_symbol_table)
+      symbol_table(_symbol_table),
+      pointer_type_selector(pointer_type_selector)
   {}
 
   void add_needed_method(const irep_idt &);
   // Returns true if new
   bool add_needed_class(const irep_idt &);
 
+  void add_all_needed_classes(const pointer_typet &pointer_type);
+
 private:
   // callable_methods is a vector because it's used as a work-list
   // which is periodically cleared. It can't be relied upon to
@@ -45,6 +53,14 @@ class ci_lazy_methods_neededt
   // repeatedly exploring a class hierarchy.
   std::unordered_set<irep_idt> &instantiated_classes;
   symbol_tablet &symbol_table;
+
+  const select_pointer_typet &pointer_type_selector;
+
+  void initialize_instantiated_classes_from_pointer(
+    const pointer_typet &pointer_type,
+    const namespacet &ns);
+
+  void gather_field_types(const typet &class_type, const namespacet &ns);
 };
 
 #endif