Stores inner class data in java class types.

Though this data is stored, it will not be used in test-gen yet because test-gen is assuming all non-public inner classes are private.

Author: jeannielynnmoulton

jbmc/src/java_bytecode/java_bytecode_convert_class.cpp

@@ -268,6 +268,7 @@ void java_bytecode_convert_classt::convert(
   class_type.set(ID_interface, c.is_interface);
   class_type.set(ID_synthetic, c.is_synthetic);
   class_type.set_final(c.is_final);
+  class_type.set_inner_class(c.is_inner_class);
   if(c.is_enum)
   {
     if(max_array_length != 0 && c.enum_elements > max_array_length)

jbmc/src/java_bytecode/java_bytecode_parse_tree.h

@@ -212,6 +212,7 @@ class java_bytecode_parse_treet
     bool is_interface = false;
     bool is_synthetic = false;
     bool is_annotation = false;
+    bool is_inner_class = false;
     bool attribute_bootstrapmethods_read = false;
     size_t enum_elements=0;
 

jbmc/src/java_bytecode/java_bytecode_parser.cpp

@@ -1668,16 +1668,23 @@ void java_bytecode_parsert::rclass_attribute(classt &parsed_class)
         std::string inner_class_info_name =
           class_infot(pool_entry(inner_class_info_index))
             .get_name(pool_entry_lambda);
-        UNUSED bool is_private = inner_class_access_flags & ACC_PRIVATE;
-        UNUSED bool is_public = inner_class_access_flags & ACC_PUBLIC;
-        UNUSED bool is_protected = inner_class_access_flags & ACC_PROTECTED;
+        bool is_private = inner_class_access_flags & ACC_PRIVATE;
+        bool is_public = inner_class_access_flags & ACC_PUBLIC;
+        bool is_protected = inner_class_access_flags & ACC_PROTECTED;
 
         // If the original parsed class name matches the inner class name
         // the parsed class is an inner class, so overwrite the parsed class'
         // access information and mark it as an inner class
-        UNUSED bool is_inner_class =
+        bool is_inner_class =
           remove_separator_char(id2string(parsed_class.name), '.') ==
           remove_separator_char(inner_class_info_name, '/');
+        if(is_inner_class)
+        {
+          parsed_class.is_inner_class = is_inner_class;
+          parsed_class.is_private = is_private;
+          parsed_class.is_protected = is_protected;
+          parsed_class.is_public = is_public;
+        }
       }
     }
   }

jbmc/src/java_bytecode/java_types.h

@@ -111,6 +111,16 @@ class java_class_typet:public class_typet
     return set(ID_access, access);
   }
 
+  const irep_idt &get_inner_class() const
+  {
+    return get(ID_is_inner_class);
+  }
+
+  void set_inner_class(const bool &is_inner_class)
+  {
+    return set(ID_is_inner_class, is_inner_class);
+  }
+
   bool get_final()
   {
     return get_bool(ID_final);

src/util/irep_ids.def

@@ -674,6 +674,7 @@ IREP_ID_ONE(interface)
 IREP_ID_TWO(C_must_not_throw, #must_not_throw)
 IREP_ID_ONE(always_inline)
 IREP_ID_ONE(is_always_inline)
+IREP_ID_ONE(is_inner_class)
 
 // Projects depending on this code base that wish to extend the list of
 // available ids should provide a file local_irep_ids.h in their source tree and