Fix bug in handling of blocks that occur in expresssions#672
Open
keyboardDrummer wants to merge 15 commits intomainfrom
Open
Fix bug in handling of blocks that occur in expresssions#672keyboardDrummer wants to merge 15 commits intomainfrom
keyboardDrummer wants to merge 15 commits intomainfrom
Conversation
joscoh
previously approved these changes
Mar 26, 2026
Contributor
joscoh
left a comment
joscoh
left a comment
There was a problem hiding this comment.
Can you update the PR with a short description of what the bug is?
…org/Strata into fixImpureExpressionBlockHandling
…org/Strata into fixImpureExpressionBlockHandling
joscoh
reviewed
Mar 26, 2026
olivier-aws
reviewed
Mar 27, 2026
| // The next statement is not translated correctly. | ||
| // I think it's a bug in the handling of StaticCall | ||
| // Where a reference is substituted when it should not be | ||
| // var z: int := addProc({x := 1; x}, {x := x + 10; x}) + (x := 3); |
Contributor
There was a problem hiding this comment.
Is the bug only affecting the case addProc, or also with add?
Contributor
Author
There was a problem hiding this comment.
I think anything with I'm not sure.StaticCall, so both
Comment on lines
-25
to
-34
| composite Box { | ||
| var value: int | ||
| } | ||
|
|
||
| procedure heapUpdateInBlockExpr(b: Box) | ||
| { | ||
| var x: int := { b#value := b#value + 1; b#value }; | ||
| assert x == b#value | ||
| }; | ||
|
|
Contributor
There was a problem hiding this comment.
Why removing this test?
Contributor
Author
There was a problem hiding this comment.
This file only applies a single phase from the Laurel pipeline, and that phase does not support the program in this test, since it uses field access which should've already been lowered at that point. Not sure how it was working before.
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
3 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.
Changes
transformStmt, which does not update the substitution map, was being called from insidetransformExprwhen it was handling a block, leading to missing substitutions. A second but smaller bug was a statement ordering bug that occurred when handling calls.Testing
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.