-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Fix: check ref mut mutability for method call arguments #7630
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.
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
Dnreikronos
wants to merge
7
commits into
FuelLabs:master
Choose a base branch
from
Dnreikronos:fix/ref-mut-method-check
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1a08c7a
Check ref mut mutability for method call arguments
Dnreikronos 009c6ca
Fix immutable arguments passed to ref mut method parameters
Dnreikronos da57ea7
Address review: use __addr_of for pointer semantics, add mcpi test
Dnreikronos 8f8d910
Merge branch 'master' into fix/ref-mut-method-check
Dnreikronos 5cff9da
Fix contract-call index skew in ref mut mutability check
Dnreikronos 9126caf
Extract shared check_arg_mutability helper
Dnreikronos 6367ec9
Apply rustfmt to method application argument loop
Dnreikronos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
3 changes: 3 additions & 0 deletions
3
test/src/e2e_vm_tests/test_programs/should_fail/ref_mut_method_mismatch/Forc.lock
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [[package]] | ||
| name = "ref_mut_method_mismatch" | ||
| source = "member" |
6 changes: 6 additions & 0 deletions
6
test/src/e2e_vm_tests/test_programs/should_fail/ref_mut_method_mismatch/Forc.toml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| [project] | ||
| authors = ["Fuel Labs <contact@fuel.sh>"] | ||
| entry = "main.sw" | ||
| license = "Apache-2.0" | ||
| name = "ref_mut_method_mismatch" | ||
| implicit-std = false |
33 changes: 33 additions & 0 deletions
33
test/src/e2e_vm_tests/test_programs/should_fail/ref_mut_method_mismatch/src/main.sw
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| script; | ||
|
|
||
| struct Point { | ||
| x: u64, | ||
| y: u64, | ||
| } | ||
|
|
||
| impl Point { | ||
| fn mutate(self, ref mut _v: u64) { } | ||
| } | ||
|
|
||
| const MY_CONST: u64 = 10; | ||
|
|
||
| fn main() { | ||
| // immutable variable | ||
| let x = 42u64; | ||
| Point { x: 1, y: 2 }.mutate(x); | ||
|
|
||
| // struct field access on immutable binding | ||
| let p = Point { x: 1, y: 2 }; | ||
| Point { x: 1, y: 2 }.mutate(p.x); | ||
|
|
||
| // tuple element access on immutable binding | ||
| let t = (1u64, 2u64); | ||
| Point { x: 1, y: 2 }.mutate(t.0); | ||
|
|
||
| // constant | ||
| Point { x: 1, y: 2 }.mutate(MY_CONST); | ||
|
|
||
| // mutable variable — should NOT error | ||
| let mut m = 99u64; | ||
| Point { x: 1, y: 2 }.mutate(m); | ||
| } |
17 changes: 17 additions & 0 deletions
17
test/src/e2e_vm_tests/test_programs/should_fail/ref_mut_method_mismatch/test.toml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| category = "fail" | ||
|
|
||
| # immutable variable | ||
| # check: $()Point { x: 1, y: 2 }.mutate(x); | ||
| # nextln: $()Cannot pass immutable argument to mutable parameter. | ||
|
|
||
| # struct field access | ||
| # check: $()Point { x: 1, y: 2 }.mutate(p.x); | ||
| # nextln: $()Cannot pass immutable argument to mutable parameter. | ||
|
|
||
| # tuple element access | ||
| # check: $()Point { x: 1, y: 2 }.mutate(t.0); | ||
| # nextln: $()Cannot pass immutable argument to mutable parameter. | ||
|
|
||
| # constant | ||
| # check: $()Point { x: 1, y: 2 }.mutate(MY_CONST); | ||
| # nextln: $()Cannot pass immutable argument to mutable parameter. |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.