From 5903a84f59b862d4bdd4e2b74dc0bb69523e67a5 Mon Sep 17 00:00:00 2001 From: Jake Fecher Date: Tue, 28 Mar 2023 22:55:18 +0100 Subject: [PATCH 1/2] Fix returning of structs in ACIR --- crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs b/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs index 4ebbbe0eef4..d320b57b8e8 100644 --- a/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs +++ b/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs @@ -53,7 +53,9 @@ pub(crate) fn evaluate( witnesses.push(witness); } evaluator.public_inputs.extend(witnesses.clone()); - evaluator.param_witnesses.insert(MAIN_RETURN_NAME.to_owned(), witnesses); + evaluator.param_witnesses.entry(MAIN_RETURN_NAME.to_owned()) + .or_default() + .append(&mut witnesses); } Ok(None) From 6d5851209e8b60406f5bf691f4af008ff62020df Mon Sep 17 00:00:00 2001 From: Jake Fecher Date: Tue, 28 Mar 2023 22:56:54 +0100 Subject: [PATCH 2/2] fmt --- crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs b/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs index d320b57b8e8..7b99b98c45e 100644 --- a/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs +++ b/crates/noirc_evaluator/src/ssa/acir_gen/operations/return.rs @@ -53,7 +53,9 @@ pub(crate) fn evaluate( witnesses.push(witness); } evaluator.public_inputs.extend(witnesses.clone()); - evaluator.param_witnesses.entry(MAIN_RETURN_NAME.to_owned()) + evaluator + .param_witnesses + .entry(MAIN_RETURN_NAME.to_owned()) .or_default() .append(&mut witnesses); }