Merge pull request #4866 from antlechner/antonia/no-inherited-in-json

Do not store duplicates of inherited static fields in tests for --static-values

Author: antlechner

jbmc/regression/jbmc/deterministic_assignments_json/clinit-state.json

@@ -313,10 +313,6 @@
       "@type":"java.lang.Long",
       "value":"9223372036854775807"
     },
-    "inheritedStatic":{
-      "@type":"java.lang.Integer",
-      "value":10
-    },
     "interfaceContainerFirst":{
       "@type":"MyInterfaceContainerA",
       "field":{

jbmc/regression/jbmc/deterministic_assignments_json/src/main/java/org/cprover/JsonGenerator.java

@@ -73,7 +73,7 @@ public static String classNameFromFile(File file) {
 
   public static StaticFieldMap<Object> staticFieldMap(Class<?> clazz) {
     StaticFieldMap<Object> staticFields = new StaticFieldMap<>();
-    for (Field field : getAllStaticFields(clazz)) {
+    for (Field field : getDeclaredStaticFields(clazz)) {
       field.setAccessible(true);
       try {
         if (!field.getName().equals("$assertionsDisabled")) {
@@ -88,20 +88,13 @@ public static StaticFieldMap<Object> staticFieldMap(Class<?> clazz) {
     return staticFields;
   }
 
-  public static List<Field> getAllStaticFields(Class<?> clazz) {
+  public static List<Field> getDeclaredStaticFields(Class<?> clazz) {
     List<Field> fields = new ArrayList<>();
-    if (clazz == null) {
-      return fields;
-    }
     for (Field field : clazz.getDeclaredFields()) {
       if ((field.getModifiers() & Modifier.STATIC) == Modifier.STATIC) {
         fields.add(field);
       }
     }
-    fields.addAll(getAllStaticFields(clazz.getSuperclass()));
-    for (Class<?> interfaze : clazz.getInterfaces()) {
-      fields.addAll(getAllStaticFields(interfaze));
-    }
     return fields;
   }
 }