Skip to content

Fix NPE When Incrementing Fields #280

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
rcosta358 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

Fix NPE When Incrementing Fields #280

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
10 changes: 10 additions & 0 deletions liquidjava-example/src/main/java/testSuite/field_updates/CorrectFieldIncrement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package testSuite.field_updates;

public class CorrectFieldIncrement {

private int field;

public void increment() {
field++;
}
}
7 changes: 4 additions & 3 deletions ...main/java/liquidjava/processor/refinement_checker/general_checkers/OperationsChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import spoon.reflect.code.CtBinaryOperator;
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtFieldRead;
import spoon.reflect.code.CtFieldWrite;
import spoon.reflect.code.CtIf;
import spoon.reflect.code.CtInvocation;
import spoon.reflect.code.CtLiteral;
Expand All @@ -39,7 +40,6 @@
import spoon.reflect.declaration.CtClass;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtExecutable;
import spoon.reflect.declaration.CtVariable;
import spoon.reflect.declaration.ParentNotInitializedException;
import spoon.reflect.reference.CtVariableReference;
import spoon.support.reflect.code.CtIfImpl;
Expand Down Expand Up @@ -123,6 +123,8 @@ public <T> void getUnaryOpRefinements(CtUnaryOperator<T> operator) throws LJErro
Predicate all;
if (ex instanceof CtVariableWrite<T> w) {
name = w.getVariable().getSimpleName();
if (w instanceof CtFieldWrite<?>)
name = String.format(Formats.THIS, name);
all = getRefinementUnaryVariableWrite(ex, operator, w, name);
rtc.checkVariableRefinements(all, name, w.getType(), operator, w.getVariable().getDeclaration());
return;
Expand Down Expand Up @@ -389,9 +391,8 @@ private Predicate createFreshValue(CtExpression<?> element, Predicate refinement
private <T> Predicate getRefinementUnaryVariableWrite(CtExpression<T> ex, CtUnaryOperator<T> operator,
CtVariableWrite<T> w, String name) throws LJError {
String newName = String.format(Formats.INSTANCE, name, rtc.getContext().getCounter());
CtVariable<T> varDecl = w.getVariable().getDeclaration();

Predicate metadada = rtc.getContext().getVariableRefinements(varDecl.getSimpleName());
Predicate metadada = rtc.getContext().getVariableRefinements(name);
metadada = metadada.substituteVariable(Keys.WILDCARD, newName);
metadada = metadada.substituteVariable(name, newName);

Expand Down
Loading