Skip to content

Fix Field Access #275

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
Open

Fix Field Access #275

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
7 changes: 3 additions & 4 deletions liquidjava-example/src/main/java/testSuite/classes/bytebuf_correct/ByteBufTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ public class ByteBufTest {

public static final int TEST_BUFFER_SIZE = 128;

// private ByteBuffer mDirectBuffer;
private ByteBuffer mDirectBuffer;

public ByteBufTest() {
// FIX (from accepted answer): mDirectBuffer = ByteBuffer.wrap(new byte[TEST_BUFFER_SIZE]);
// or guard with: if (mDirectBuffer.hasArray()) { ... }
ByteBuffer mDirectBuffer = ByteBuffer.wrap(new byte[TEST_BUFFER_SIZE]);
// VIOLATION: a direct buffer is not array-backed -> array() throws
// UnsupportedOperationException.
mDirectBuffer = ByteBuffer.wrap(new byte[TEST_BUFFER_SIZE]);
// wrap returns an array-backed buffer, so the field retains the state required by array()
byte[] buf = mDirectBuffer.array();
buf[1] = 100;
}
Expand Down
4 changes: 2 additions & 2 deletions liquidjava-example/src/main/java/testSuite/classes/bytebuf_error/ByteBufTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ public class ByteBufTest {

public static final int TEST_BUFFER_SIZE = 128;

// private ByteBuffer mDirectBuffer;
private ByteBuffer mDirectBuffer;

public ByteBufTest() {
// FIX (from accepted answer): mDirectBuffer = ByteBuffer.wrap(new byte[TEST_BUFFER_SIZE]);
// or guard with: if (mDirectBuffer.hasArray()) { ... }
ByteBuffer mDirectBuffer = ByteBuffer.allocateDirect(TEST_BUFFER_SIZE);
mDirectBuffer = ByteBuffer.allocateDirect(TEST_BUFFER_SIZE);
// VIOLATION: a direct buffer is not array-backed -> array() throws
// UnsupportedOperationException.
byte[] buf = mDirectBuffer.array(); // State Refinement Error
Expand Down
8 changes: 8 additions & 0 deletions ...rc/main/java/liquidjava/processor/refinement_checker/object_checkers/AuxStateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,11 +594,19 @@ public static String prepareInvocationTarget(TypeChecker tc, CtElement target2,
// v--------- field read
// means invocation is in a form of `t.method(args)`
String name = v.getVariable().getSimpleName();
if (target2 instanceof CtFieldRead<?> fieldRead && fieldRead.getTarget() instanceof CtThisAccess<?>) {
String fieldName = String.format(Formats.THIS, name);
if (tc.getContext().hasVariable(fieldName))
name = fieldName;
}
Optional<VariableInstance> invocationCallee = tc.getContext().getLastVariableInstance(name);
if (invocationCallee.isPresent()) {
invocation.putMetadata(Keys.TARGET, invocationCallee.get());
} else if (target2.getMetadata(Keys.TARGET) == null) {
RefinedVariable var = tc.getContext().getVariableByName(name);
if (var == null)
return name;

String nName = String.format(Formats.INSTANCE, name, tc.getContext().getCounter());
RefinedVariable rv = tc.getContext().addInstanceToContext(nName, var.getType(),
var.getRefinement().substituteVariable(name, nName), target2);
Expand Down
Loading