Add storage of final modifier status of java classes in java_class_typet.

Author: thomasspriggs

src/java_bytecode/java_bytecode_convert_class.cpp

@@ -265,6 +265,7 @@ void java_bytecode_convert_classt::convert(
   class_type.set_tag(c.name);
   class_type.set(ID_base_name, c.name);
   class_type.set(ID_abstract, c.is_abstract);
+  class_type.set_final(c.is_final);
   if(c.is_enum)
   {
     if(max_array_length != 0 && c.enum_elements > max_array_length)

src/java_bytecode/java_bytecode_parse_tree.cpp

@@ -29,6 +29,7 @@ void java_bytecode_parse_treet::classt::swap(
   std::swap(other.is_public, is_public);
   std::swap(other.is_protected, is_protected);
   std::swap(other.is_private, is_private);
+  std::swap(other.is_final, is_final);
   std::swap(other.signature, signature);
   other.implements.swap(implements);
   other.fields.swap(fields);

src/java_bytecode/java_bytecode_parse_tree.h

@@ -182,6 +182,7 @@ class java_bytecode_parse_treet
     bool is_abstract=false;
     bool is_enum=false;
     bool is_public=false, is_protected=false, is_private=false;
+    bool is_final = false;
     bool attribute_bootstrapmethods_read = false;
     size_t enum_elements=0;
 

src/java_bytecode/java_bytecode_parser.cpp

@@ -495,6 +495,7 @@ void java_bytecode_parsert::rClassFile()
   parsed_class.is_public=(access_flags&ACC_PUBLIC)!=0;
   parsed_class.is_protected=(access_flags&ACC_PROTECTED)!=0;
   parsed_class.is_private=(access_flags&ACC_PRIVATE)!=0;
+  parsed_class.is_final = (access_flags & ACC_FINAL) != 0;
   parsed_class.name=
     constant(this_class).type().get(ID_C_base_name);
 

src/java_bytecode/java_types.h

@@ -111,6 +111,16 @@ class java_class_typet:public class_typet
     return set(ID_access, access);
   }
 
+  bool get_final()
+  {
+    return get_bool(ID_final);
+  }
+
+  void set_final(bool is_final)
+  {
+    set(ID_final, is_final);
+  }
+
   typedef std::vector<symbol_exprt> java_lambda_method_handlest;
 
   const java_lambda_method_handlest &lambda_method_handles() const

src/util/irep_ids.def

@@ -667,6 +667,7 @@ IREP_ID_TWO(C_no_initialization_required, #no_initialization_required)
 IREP_ID_TWO(overlay_class, java::com.diffblue.OverlayClassImplementation)
 IREP_ID_TWO(overlay_method, java::com.diffblue.OverlayMethodImplementation)
 IREP_ID_TWO(C_annotations, #annotations)
+IREP_ID_ONE(final)
 
 // 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