Skip to content
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

Fix compact canonical record constructor not using correct parameter names #327

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compact canonical record constructor not using correct parameter names #327

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
12 changes: 10 additions & 2 deletions src/org/benf/cfr/reader/bytecode/analysis/opgraph/op4rewriters/RecordRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,10 @@ private static void hideConstructorIfEmpty(Method canonicalCons) {
}
}

/**
* Tries to remove implicit field assignments from this canonical record constructor, turning
* it into a compact canonical constructor. Returns {@code true} if successful.
*/
private static boolean removeImplicitAssignments(Method canonicalCons, List<ClassFileField> instances, JavaRefTypeInstance thisType) {
if (canonicalCons.getCodeAttribute() == null) return false;
Op04StructuredStatement code = canonicalCons.getAnalysis();
Expand All @@ -333,18 +337,22 @@ private static boolean removeImplicitAssignments(Method canonicalCons, List<Clas
// this is very messy - refactor using wildcardmatch.
if (statement.isEffectivelyNOP()) continue;
if (!(statement instanceof StructuredAssignment)) break;
LValue lhs = ((StructuredAssignment) statement).getLvalue();

StructuredAssignment assignment = (StructuredAssignment) statement;
LValue lhs = assignment.getLvalue();
ClassFileField field = getCFF(lhs, thisType);
if (field == null) break;
int idx = instances.indexOf(field);
if (idx == -1) break;
instances.set(idx, null);

Expression rhs = ((StructuredAssignment) statement).getRvalue();
Expression rhs = assignment.getRvalue();
if (!(rhs instanceof LValueExpression)) break;
LValue rlv = ((LValueExpression) rhs).getLValue();
LocalVariable expected = args.get(idx);
if (rlv != expected) break;
// Implicit parameter must use the same name as the field
expected.getName().forceName(field.getFieldName());
Comment on lines +354 to +355
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Might have to be moved down outside the loop to be sure that this is actually a compact canonical constructor. But probably does not hurt to have it here either, since the condition in the line before already made sure that parameter and field match.

toNop.add(stm);
nopFrom = x;
}
Expand Down