Fix: Constant initialization in the Dafny-to-Rust code generator #5837
+169
−45
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
robin-aws
requested changes
Oct 16, 2024
There was a problem hiding this comment.
Intentional?
Have we been announcing bug fixes like this while the Rust code generator isn't fully supported yet?
There was a problem hiding this comment.
I'd prefer to leave it quiet too.
| @@ -323,6 +323,7 @@ module {:extern "DAST"} DAST { | |||
| UnboundedIntRange(start: Expression, up: bool) | | |||
| Quantifier(elemType: Type, collection: Expression, is_forall: bool, lambda: Expression) | |||
|
|
|||
| datatype FieldMutability = ConstantField | MutableField | InternalConstantField | |||
There was a problem hiding this comment.
Suggested change
| datatype FieldMutability = ConstantField | MutableField | InternalConstantField | |
| datatype FieldMutability = ConstantField | ClassMutableField | ClassConstantField |
I didn't understand "InternalConstantField" until I looked at the test.
There was a problem hiding this comment.
ClassMutableField is ok, but the last one is really internal, so it should be ClassInternalConstantField, all right?
robin-aws
reviewed
Oct 16, 2024
| } else { | ||
| r := read_field_macro.Apply1(r); // Already contains a clone. | ||
| assert fieldMutability.MutableField?; |
There was a problem hiding this comment.
Wouldn't a match statement be a little cleaner? (Instead of the chained if)
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.
Fixes #5833
Description
There are now three kinds of generated fields:
::dafny_runtime::Field<...>to avoid any soundness issue, and use the wrappersread_fieldandmodify_fieldto read and modify them.Before this PR, only the last two were implemented, which lead to issues when trying to assign the default value of a class constant.
This issue was not captured because the test started to fail but since it's was marked
%testForEachCompilerand these tests are ignored in the CI, we did not detect it.How has this been tested?
Updated the file classes.dfy. All other tests in comp/rust should pass.
By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.