Marks anonymous classes as inner classes

Author: jeannielynnmoulton

jbmc/src/java_bytecode/java_bytecode_parser.cpp

@@ -1628,18 +1628,17 @@ void java_bytecode_parsert::rinner_classes_attribute(
 
     // 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
-    parsed_class.is_inner_class =
-      remove_separator_char(id2string(parsed_class.name), '.') ==
+    // access information and mark it as an inner class.
+    bool is_inner_class = remove_separator_char(id2string(parsed_class.name), '.') ==
       remove_separator_char(inner_class_info_name, '/');
-    if(!parsed_class.is_inner_class)
+    if(is_inner_class)
+      parsed_class.is_inner_class = is_inner_class;
+    if(!is_inner_class)
       continue;
     // Note that if outer_class_info_index == 0, the inner class is an anonymous
     // or local class, and is treated as private.
     if(outer_class_info_index == 0)
     {
-      // This is a marker for an anonymous or local class
-      // which are treated as private
       parsed_class.is_private = true;
       parsed_class.is_protected = false;
       parsed_class.is_public = false;

jbmc/unit/java_bytecode/java_bytecode_parser/parse_java_attributes.cpp

@@ -204,7 +204,7 @@ SCENARIO(
           new_symbol_table.lookup_ref("java::ContainsAnonymousClass$1");
         const java_class_typet java_class =
           to_java_class_type(class_symbol.type);
-        REQUIRE_FALSE(java_class.get_is_inner_class());
+        REQUIRE(java_class.get_is_inner_class());
         REQUIRE(java_class.get_access() == ID_private);
       }
     }
@@ -218,7 +218,7 @@ SCENARIO(
           new_symbol_table.lookup_ref("java::ContainsAnonymousClass$2");
         const java_class_typet java_class =
           to_java_class_type(class_symbol.type);
-        REQUIRE_FALSE(java_class.get_is_inner_class());
+        REQUIRE(java_class.get_is_inner_class());
         REQUIRE(java_class.get_access() == ID_private);
       }
     }
@@ -230,7 +230,7 @@ SCENARIO(
           new_symbol_table.lookup_ref("java::ContainsAnonymousClass$3");
         const java_class_typet java_class =
           to_java_class_type(class_symbol.type);
-        REQUIRE_FALSE(java_class.get_is_inner_class());
+        REQUIRE(java_class.get_is_inner_class());
         REQUIRE(java_class.get_access() == ID_private);
       }
     }
@@ -242,7 +242,7 @@ SCENARIO(
           new_symbol_table.lookup_ref("java::ContainsAnonymousClass$4");
         const java_class_typet java_class =
           to_java_class_type(class_symbol.type);
-        REQUIRE_FALSE(java_class.get_is_inner_class());
+        REQUIRE(java_class.get_is_inner_class());
         REQUIRE(java_class.get_access() == ID_private);
       }
     }