Repository navigation
Fix collisions between same-named fields - #327
Merged
Merged
Conversation
This was
linked to
issues
Oct 3, 2026
CatarinaGamboa
approved these changes
Oct 6, 2026
| } | ||
|
|
||
| public static String qualifyFieldName(CtFieldReference<?> field) { | ||
| return "this#" + field.getDeclaringType().getQualifiedName() + "." + field.getSimpleName(); |
Collaborator
There was a problem hiding this comment.
i wonder if we can also remove the # in the middle here and use the . so its more like java and less our workaround.
Collaborator
Author
There was a problem hiding this comment.
I had thought about that but that requires changing the grammar and will cause conflicts but we can give it a shot.
CatarinaGamboa
added a commit
that referenced
this pull request
Oct 20, 2026
Fixes #321, fixes #322. Field reads could pick up the refinement of the wrong variable, so real violations passed: - **#321:** `visitCtFieldRead` first looked a field up by its simple name. Since #327 fields are stored only under their qualified name (`this#<DeclaringType>.<name>`), that lookup could only find a local with the same name, so `Format.JPG` read a local `JPG`. That branch is removed. - **#322:** `Limits.max` already resolves correctly on main thanks to #327's qualified names; this PR adds a regression fixture. `other.val` still used the tracked `this#C.val`, which holds the current object's value. The new `Utils.accessesTrackedField` is true only for static fields and `this`, `super` and `Outer.this` targets; reads on any other object now use the field's declared refinement, which is checked at every write and so holds for every instance. This applies to field reads, binary-operation operands (including `if` conditions, which previously also overwrote what was known about `this.val`) and compound assignments such as `j += other.val`. Fixtures: `ErrorFieldOfOtherClass`, `ErrorFieldOfOtherObject` (plain read, sum, `+=`, `if` condition), `ErrorLocalShadowsConstant` (enum constant and `static final int`), and the control `CorrectFieldReadResolution`. Without the fix the two latter Error fixtures pass verification and the control gives a false error. Not fixed here (writes, needs its own issue): `other.val = 9` is checked against the declared refinement but also updates `this#C.val`, so `val = 7; other.val = 9;` then `@Refinement("_ == 9") int k = val;` verifies. The same write path handles `other.val++`, compound assignments, and the typestate ghost-field update in `AuxStateHandler.updateGhostField`, which assumes `this`. Also observed: test files that each declare an enum with the same simple name can clash within one JVM run ("Sorts ...A$Format and ...B$Format are incompatible"), so some state persists across test files. The fixtures use distinct enum names to avoid it. Validation: `mvn test` passes all 414 tests (253 TestExamples cases). 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #318 and #315.
Qualifies field names by declaring class, adds a combined nested-field regression, and fixes negative literal initializers.
Tests:
TestExamples(201 passed).This PR was generated by Codex.