Skip to content

fix: fix an ICE happening when we call a closure result from if/else #2146

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

Merged
jfecher merged 2 commits into from
Aug 4, 2023
Merged

fix: fix an ICE happening when we call a closure result from if/else #2146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8ff27
fix: fix an ICE happening when we call a closure result from if/else
alehander92 Aug 3, 2023
7761a54
refactor: moved test to a regression fn, cleanup code
alehander92 Aug 3, 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
20 changes: 20 additions & 0 deletions crates/nargo_cli/tests/test_data/higher_order_functions/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ fn main() -> pub Field {
x += 1;
assert(closure_capturing_mutable(1) == 5);

regression_2154();

let ret = twice(add1, 3);

test_array_functions();
Expand Down Expand Up @@ -85,3 +87,21 @@ fn add1(x: Field) -> Field {
fn twice(f: fn(Field) -> Field, x: Field) -> Field {
f(f(x))
}

// Fixing an ICE, where rewriting the closures
// during monomorphization didn't correspond
// to an internal `if` type
// found by @jfecher:
// https://github.com/noir-lang/noir/pull/1959#issuecomment-1658992989
// issue https://github.com/noir-lang/noir/issues/2154
fn regression_2154() {
let x: u32 = 32;

let closure_if_else = if x > 2 {
|| x
} else {
|| x + 2342
};

assert(closure_if_else() == 32);
}
15 changes: 13 additions & 2 deletions crates/noirc_frontend/src/monomorphization/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,19 @@ impl<'interner> Monomorphizer<'interner> {
HirType::Function(args, ret, env) => {
let args = vecmap(args, Self::convert_type);
let ret = Box::new(Self::convert_type(ret));
let env = Box::new(Self::convert_type(env));
ast::Type::Function(args, ret, env)
let env = Self::convert_type(env);
match &env {
ast::Type::Unit => ast::Type::Function(args, ret, Box::new(env)),
ast::Type::Tuple(_elements) => ast::Type::Tuple(vec![
env.clone(),
ast::Type::Function(args, ret, Box::new(env)),
]),
Comment thread
jfecher marked this conversation as resolved.
_ => {
unreachable!(
"internal Type::Function env should be either a Unit or a Tuple, not {env}"
)
}
}
}

HirType::MutableReference(element) => {
Expand Down