[Compiler-v2] fix receiver call with index notation #15239
Merged
Conversation
This file contains 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
⏱️ 2h 18m total CI duration on this PR
|
rahxephon89
changed the title
vineethk
approved these changes
Nov 8, 2024
| "receiver call needs to have at least one parameter" | ||
| ); | ||
| let receiver_call_opt = self.get_receiver_function(&arg_types[0], name); | ||
| if let (Some(receiver_call), Exp_::ExpDotted(dotted)) = |
There was a problem hiding this comment.
Can we add a test case where receiver_call_opt would be None? When I tried this out, we get a "unknown receiver function" error, but might be good to have a test to prevent any regressions.
There was a problem hiding this comment.
Added a test case to calls_index_errors.move.
rahxephon89
force-pushed
the
teng/fix-15224
branch
from
174da20 to
e7924fb
Compare
vineethk
approved these changes
Nov 8, 2024
brmataptos
reviewed
Nov 12, 2024
I have tested this case but will add a test case |
rahxephon89
force-pushed
the
teng/fix-15224
branch
from
e7924fb to
cf46f9c
Compare
|
@vineethk @brmataptos, I need another round review for handling |
rahxephon89
changed the title
vineethk
approved these changes
Nov 13, 2024
| translated_args[0] = first_arg.into_exp(); | ||
| } | ||
| } else if let Exp_::Index(target, index) = &args[0].value { | ||
| // special case for the receiver call S[x].fun(&...) |
There was a problem hiding this comment.
Suggested change
| // special case for the receiver call S[x].fun(&...) | |
| // special case for the receiver call `S[x].fun(&...)` and `S[x].fun(&mut...)` |
| let receiver_call_opt = self.get_receiver_function(&arg_types[0], name); | ||
| if let Some(receiver_call) = receiver_call_opt { | ||
| if let Exp_::ExpDotted(dotted) = &args[0].value { | ||
| // special case for the receiver call S[x].f.fun(&mut...) |
There was a problem hiding this comment.
Would be useful to add some note on why these special cases are needed (e.g., we resolve X before doing Y translation), for future refactors/bug fixes.
| } | ||
|
|
||
| fun foo_2(account: address, w: W) acquires W { | ||
| W[account].merge(w) |
There was a problem hiding this comment.
Could we add the following test case (or similar) that tests:
- Non-mut ref receiver over resource indexing
- Resource indexing on a generic type that goes through the newly added translation.
struct Wrapper<T> has drop, key, store, copy {
inner: T
}
fun unwrap<T>(self: &Wrapper<T>): T {
self.inner
}
fun dispatch<T>(account: address): T acquires Wrapper {
Wrapper<T>[account].unwrap()
}
cf46f9c to
5ad7598
Compare
rahxephon89
force-pushed
the
teng/fix-15224
branch
from
5ad7598 to
447fc98
Compare
brmataptos
approved these changes
Nov 13, 2024
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
✅ Forge suite
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR fixes
A[...].foo(&)orA[...].foo(&mut), translateA[...]into a reference directly so that it behaves like(&A[...]).foo(...)or(&mut A[...]).foo(...).Close #15224
How Has This Been Tested?
Key Areas to Review
Type of Change
Which Components or Systems Does This Change Impact?
Checklist