Merge pull request diffblue#2571 from jeannielynnmoulton/jeannie/InnerClassAccessibility

[TG-4099] Parse and capture outer class information for an inner class

Author: Matthias Güdemann

jbmc/src/java_bytecode/java_bytecode_convert_class.cpp

@@ -279,6 +279,7 @@ void java_bytecode_convert_classt::convert(
   class_type.set_is_inner_class(c.is_inner_class);
   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);
   if(c.is_enum)
   {
     if(max_array_length != 0 && c.enum_elements > max_array_length)

jbmc/src/java_bytecode/java_bytecode_parse_tree.h

@@ -208,6 +208,7 @@ struct java_bytecode_parse_treet
     bool is_static_class = false;
     bool is_anonymous_class = false;
     bool attribute_bootstrapmethods_read = false;
+    irep_idt outer_class; // when no outer class is set, there is no outer class
     size_t enum_elements=0;
 
     enum class method_handle_typet

jbmc/src/java_bytecode/java_bytecode_parser.cpp

@@ -1643,6 +1643,11 @@ void java_bytecode_parsert::rinner_classes_attribute(
     }
     else
     {
+      std::string outer_class_info_name =
+        class_infot(pool_entry(outer_class_info_index))
+          .get_name(pool_entry_lambda);
+      parsed_class.outer_class =
+        constant(outer_class_info_index).type().get(ID_C_base_name);
       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

@@ -121,6 +121,16 @@ class java_class_typet:public class_typet
     return set(ID_is_inner_class, is_inner_class);
   }
 
+  const irep_idt get_outer_class() const
+  {
+    return get(ID_outer_class);
+  }
+
+  void set_outer_class(irep_idt outer_class)
+  {
+    return set(ID_outer_class, outer_class);
+  }
+
   const bool get_is_static_class() const
   {
     return get_bool(ID_is_static);

jbmc/unit/java_bytecode/java_bytecode_parser/ContainsAnonymousClass$1.class

@@ -85,6 +85,72 @@ private PrivateDoublyNestedInnerClass(int i) {
     }
 }
 
+class InnerPrivateClassesDeeplyNested {
+    private class SinglyNestedPrivateClass {
+        int i;
+        SinglyNestedPrivateClass(int i) {
+            this.i = i;
+        }
+        public class PublicDoublyNestedInnerClass {
+            public int i;
+            public PublicDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+        class DefaultDoublyNestedInnerClass {
+            int i;
+            DefaultDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+        protected class ProtectedDoublyNestedInnerClass {
+            protected int i;
+            protected ProtectedDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+        private class PrivateDoublyNestedInnerClass {
+            private int i;
+            private PrivateDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+    }
+}
+
+class OuterClassMostRestrictiveDeeplyNested {
+    public class SinglyNestedPublicClass {
+        int i;
+        SinglyNestedPublicClass(int i) {
+            this.i = i;
+        }
+        public class PublicDoublyNestedInnerClass {
+            public int i;
+            public PublicDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+        class DefaultDoublyNestedInnerClass {
+            int i;
+            DefaultDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+        protected class ProtectedDoublyNestedInnerClass {
+            protected int i;
+            protected ProtectedDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+        private class PrivateDoublyNestedInnerClass {
+            private int i;
+            private PrivateDoublyNestedInnerClass(int i) {
+                this.i = i;
+            }
+        }
+    }
+}
+
 class ContainsAnonymousClass {
     interface InnerInterface {
         int i = 0;