Add method to get super class from java class type.

jeannielynnmoulton · jeannielynnmoulton · commit 5994dd85ad17 · 2018-07-31T11:13:29.000+01:00
diff --git a/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp
@@ -280,6 +280,7 @@ void java_bytecode_convert_classt::convert(
   class_type.set_is_static_class(c.is_static_class);
   class_type.set_is_anonymous_class(c.is_anonymous_class);
   class_type.set_outer_class(c.outer_class);
+  class_type.set_super_class(c.super_class);
   if(c.is_enum)
   {
     if(max_array_length != 0 && c.enum_elements > max_array_length)
diff --git a/jbmc/src/java_bytecode/java_bytecode_parser.cpp b/jbmc/src/java_bytecode/java_bytecode_parser.cpp
@@ -503,8 +503,7 @@ void java_bytecode_parsert::rClassFile()
     constant(this_class).type().get(ID_C_base_name);
 
   if(super_class!=0)
-    parsed_class.super_class=
-      constant(super_class).type().get(ID_C_base_name);
+    parsed_class.super_class = constant(super_class).type().get(ID_C_base_name);
 
   rinterfaces(parsed_class);
   rfields(parsed_class);
diff --git a/jbmc/src/java_bytecode/java_types.h b/jbmc/src/java_bytecode/java_types.h
@@ -131,6 +131,16 @@ class java_class_typet:public class_typet
     return set(ID_outer_class, outer_class);
   }
 
+  const irep_idt &get_super_class() const
+  {
+    return get(ID_super_class);
+  }
+
+  void set_super_class(const irep_idt &super_class)
+  {
+    return set(ID_super_class, super_class);
+  }
+
   const bool get_is_static_class() const
   {
     return get_bool(ID_is_static);
diff --git a/src/util/irep_ids.def b/src/util/irep_ids.def
@@ -693,6 +693,7 @@ IREP_ID_TWO(C_qualifier, #qualifier)
 IREP_ID_TWO(C_array_ini, #array_ini)
 IREP_ID_ONE(r_ok)
 IREP_ID_ONE(w_ok)
+IREP_ID_ONE(super_class)
 
 // Projects depending on this code base that wish to extend the list of
 // available ids should provide a file local_irep_ids.def in their source tree

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,7 @@ void java_bytecode_convert_classt::convert(`
`280`	`280`	`class_type.set_is_static_class(c.is_static_class);`
`281`	`281`	`class_type.set_is_anonymous_class(c.is_anonymous_class);`
`282`	`282`	`class_type.set_outer_class(c.outer_class);`
	`283`	`+ class_type.set_super_class(c.super_class);`
`283`	`284`	`if(c.is_enum)`
`284`	`285`	`{`
`285`	`286`	`if(max_array_length != 0 && c.enum_elements > max_array_length)`