fix: support for conditional stores#2553
Merged
kevaundray merged 13 commits intomasterfrom Sep 13, 2023
Merged
Conversation
Contributor
|
This looks to be failing with the same bug I have here (#2446). I'm working on a fix as I think I may know the issue. |
Contributor
|
The failing test should pass now if you pull master. |
vezenovm
reviewed
Sep 5, 2023
Contributor
vezenovm
left a comment
There was a problem hiding this comment.
Could we add a test like below to array_dynamic where idx is greater than the length of x?
fn regression_mem_op_predicate(mut x: [u32; 5], idx: Field) {
// We should not hit out of bounds here as we have a predicate
// that should not be hit
if idx as u32 < 3 {
x[idx] = 10;
}
assert(x[4] == 111);
}
5 tasks
vezenovm
reviewed
Sep 6, 2023
crates/nargo_cli/tests/execution_success/regression_mem_op_predicate/src/main.nr
Outdated
Show resolved
Hide resolved
vezenovm
reviewed
Sep 7, 2023
Contributor
vezenovm
left a comment
There was a problem hiding this comment.
Just some comments suggestions mainly, but none are blocking for getting this out
jfecher
reviewed
Sep 7, 2023
Contributor
|
LGTM. We can merge once merge conflicts are fixed |
const/non const index-predicate yes/no-get/set
vezenovm
previously approved these changes
Sep 13, 2023
vezenovm
approved these changes
Sep 13, 2023
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
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
Problem*
Resolves #2493
Summary*
Array Set with side-effect context are replaced by predicate*value+(1-predicate)array read
The index of array operation is also replaced by predicateindex.
This strategy does not work with empty slice since we would access index 0 and that would still fail with an empty slice, but I believe this case is degenerate enough to not support it.
Documentation
This PR requires documentation updates when merged.
Additional Context
The PR requires ACVM PR 524 for the CI tests to pass.
PR Checklist*
cargo fmton default settings.