Skip to content

Approximations bugfixes #14

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Approximations bugfixes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d392ee
Fix stream copying
mxprshn Aug 21, 2024
c746513
Fix System.props not initialized
mxprshn Aug 22, 2024
ae94860
Fix infinite recursion in String.valueOf
mxprshn Aug 22, 2024
b9a75a1
Fix getAllFields in ArrayListDecoder
mxprshn Aug 29, 2024
1f1d300
Enforce UTF16 for strings and fix length
mxprshn Aug 22, 2024
f1e379f
Properties approximation, System approximation fix
mxprshn Sep 19, 2024
9cc8fd6
Arrays.asList approximation
mxprshn Sep 19, 2024
adee8af
New String and StringBuilder approximations
mxprshn Sep 19, 2024
b54743d
Set COMPACT_STRINGS = true in static constructor
mxprshn Sep 19, 2024
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
13 changes: 11 additions & 2 deletions approximations/src/main/java/decoders/java/util/ArrayList_Decoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public <T> T createInstance(final JcClassOrInterface approx,

List<JcParameter> params = m.getParameters();
if (params.size() != 1) continue;
if (!"java.lang.Object".equals(params.get(0).getType().getTypeName())) continue;

cached_ArrayList_add = m_add = m;
}
Expand All @@ -60,6 +59,16 @@ public <T> T createInstance(final JcClassOrInterface approx,
return decoder.invokeMethod(m_ctor, (List<T>) Collections.EMPTY_LIST);
}

private static List<JcField> getAllFields(JcClassOrInterface clazz) {
JcClassOrInterface superclass = clazz.getSuperClass();
if (superclass == null) {
return clazz.getDeclaredFields();
}
List<JcField> declaredFields = clazz.getDeclaredFields();
declaredFields.addAll(getAllFields(superclass));
return declaredFields;
}

@Override
public <T> void initializeInstance(final JcClassOrInterface approx,
final ObjectData<T> approxData,
Expand All @@ -68,7 +77,7 @@ public <T> void initializeInstance(final JcClassOrInterface approx,
JcField f_storage = cached_ArrayList_storage;
// TODO: add synchronization if needed
if (f_storage == null) {
final List<JcField> fields = approx.getDeclaredFields();
final List<JcField> fields = getAllFields(approx);
for (int i = 0, c = fields.size(); i < c; i++) {
JcField f = fields.get(i);
if ("storage".equals(f.getName())) {
Expand Down
Loading