feat: Sync from aztec-packages

.aztec-sync-commit

@@ -1 +1 @@
-e69b58660ff843350e1e098d8f1a84f4ce3d3c34
+9e246c1289fa40c35c4b28d2f0081dfdc2aa9d19

aztec_macros/src/lib.rs

@@ -648,6 +648,10 @@
 
     // Abstract return types such that they get added to the kernel's return_values
     if let Some(return_values) = abstract_return_values(func) {
+        // In case we are pushing return values to the context, we remove the statement that originated it
+        // This avoids running duplicate code, since blocks like if/else can be value returning statements
+        func.def.body.0.pop();
+        // Add the new return statement
         func.def.body.0.push(return_values);
     }
 
@@ -1255,13 +1259,11 @@
 /// Any primitive type that can be cast will be casted to a field and pushed to the context.
 fn abstract_return_values(func: &NoirFunction) -> Option<Statement> {
     let current_return_type = func.return_type().typ;
-    let len = func.def.body.len();
-    let last_statement = &func.def.body.0[len - 1];
+    let last_statement = func.def.body.0.last()?;
 
     // TODO: (length, type) => We can limit the size of the array returned to be limited by kernel size
     // Doesn't need done until we have settled on a kernel size
     // TODO: support tuples here and in inputs -> convert into an issue
-
     // Check if the return type is an expression, if it is, we can handle it
     match last_statement {
         Statement { kind: StatementKind::Expression(expression), .. } => {
@@ -1656,8 +1658,8 @@
     // If compute_note_hash_and_nullifier is already defined by the user, we skip auto-generation in order to provide an
     // escape hatch for this mechanism.
     // TODO(#4647): improve this diagnosis and error messaging.
     if collected_functions.iter().any(|coll_funcs_data| {
         check_for_compute_note_hash_and_nullifier_definition(&coll_funcs_data.functions, module_id)
     }) {
         return Ok(());
     }
@@ -1711,7 +1713,7 @@
     unresolved_traits_impls: &[UnresolvedTraitImpl],
     trait_name: &str,
 ) -> Vec<String> {
     let mut struct_typenames: Vec<String> = Vec::new();
 
     // These structs can be declared in either external crates or the current one. External crates that contain
     // dependencies have already been processed and resolved, but are available here via the NodeInterner. Note that
@@ -1721,7 +1723,7 @@
 
         if trait_impl.borrow().ident.0.contents == *trait_name {
             if let Type::Struct(s, _) = &trait_impl.borrow().typ {
                 struct_typenames.push(s.borrow().name.0.contents.clone());
             } else {
                 panic!("Found impl for {} on non-Struct", trait_name);
             }
@@ -1729,7 +1731,7 @@
     }
 
     // This crate's traits and impls have not yet been resolved, so we look for impls in unresolved_trait_impls.
     struct_typenames.extend(
         unresolved_traits_impls
             .iter()
             .filter(|trait_impl| {
@@ -1750,7 +1752,7 @@
             }),
     );
 
     struct_typenames
 }
 
 fn generate_compute_note_hash_and_nullifier(note_types: &Vec<String>) -> NoirFunction {