Skip to content
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.

Sign up for GitHub

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

fix: Fix subtract with underflow in flattening pass #2796

Merged
merged 3 commits into from
Sep 22, 2023
Merged

fix: Fix subtract with underflow in flattening pass #2796

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f64ea5
Optimize out constant ifs in flattening pass
jfecher Sep 22, 2023
d24f9c0
Revert "Optimize out constant ifs in flattening pass"
jfecher Sep 22, 2023
2cd7e6f
Fix subtract with underflow
jfecher Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
//! v11 = mul v4, Field 12
//! v12 = add v10, v11
//! store v12 at v5 (new store)
use fxhash::FxHashMap as HashMap;

Check warning on line 134 in compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs

View workflow job for this annotation

GitHub Actions / Spellcheck / Spellcheck 

Unknown word (fxhash)
use std::collections::{BTreeMap, HashSet};

use acvm::FieldElement;
Expand Down Expand Up @@ -461,7 +461,7 @@
let mut get_element = |array, typevars, len| {
// The smaller slice is filled with placeholder data. Codegen for slice accesses must
// include checks against the dynamic slice length so that this placeholder data is not incorrectly accessed.
if (len - 1) < index_value.to_u128() as usize {
if len <= index_value.to_u128() as usize {
let zero = FieldElement::zero();
self.inserter.function.dfg.make_constant(zero, Type::field())
} else {
Expand Down
Loading