Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions jbmc/regression/jbmc/deterministic_assignments_json/clinit-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,6 @@
"@type":"java.lang.Long",
"value":"9223372036854775807"
},
"inheritedStatic":{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ Is this how it works in the actual script too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be. 🙂
The "actual script" comments might be confusing for some people. I'll think about how to resolve this and will try to add some more info in a follow-up PR.

"@type":"java.lang.Integer",
"value":10
},
"interfaceContainerFirst":{
"@type":"MyInterfaceContainerA",
"field":{
Expand Down
11 changes: 2 additions & 9 deletions ...gression/jbmc/deterministic_assignments_json/src/main/java/org/cprover/JsonGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand All @@ -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;
}
}