fix(brillig): Globals entry point reachability analysis

compiler/noirc_evaluator/src/acir/mod.rs

@@ -3328,7 +3328,7 @@ mod test {
         build_basic_foo_with_return(&mut builder, foo_id, true, InlineType::default());
         build_basic_foo_with_return(&mut builder, bar_id, true, InlineType::default());
 
-        let ssa = builder.finish();
+        let mut ssa = builder.finish();
         let brillig = ssa.to_brillig(false);
 
         let (acir_functions, brillig_functions, _, _) = ssa
@@ -3466,7 +3466,7 @@ mod test {
 
         build_basic_foo_with_return(&mut builder, foo_id, true, InlineType::default());
 
-        let ssa = builder.finish();
+        let mut ssa = builder.finish();
         // We need to generate  Brillig artifacts for the regular Brillig function and pass them to the ACIR generation pass.
         let brillig = ssa.to_brillig(false);
         println!("{}", ssa);
@@ -3555,7 +3555,7 @@ mod test {
         // Build an ACIR function which has the same logic as the Brillig function above
         build_basic_foo_with_return(&mut builder, bar_id, false, InlineType::Fold);
 
-        let ssa = builder.finish();
+        let mut ssa = builder.finish();
         // We need to generate  Brillig artifacts for the regular Brillig function and pass them to the ACIR generation pass.
         let brillig = ssa.to_brillig(false);
         println!("{}", ssa);
@@ -3673,7 +3673,7 @@ mod test {
                 return v3
             }
         ";
-        let ssa = Ssa::from_str(src).unwrap();
+        let mut ssa = Ssa::from_str(src).unwrap();
         let brillig = ssa.to_brillig(false);
 
         let (mut acir_functions, _brillig_functions, _, _) = ssa
@@ -3711,7 +3711,7 @@ mod test {
               return
           }
         ";
-        let ssa = Ssa::from_str(src).unwrap();
+        let mut ssa = Ssa::from_str(src).unwrap();
         let brillig = ssa.to_brillig(false);
 
         let (acir_functions, _brillig_functions, _, _) = ssa

compiler/noirc_evaluator/src/brillig/brillig_gen.rs

@@ -58,12 +58,14 @@ pub(crate) fn gen_brillig_for(
     brillig: &Brillig,
 ) -> Result<GeneratedBrillig<FieldElement>, InternalError> {
     // Create the entry point artifact
+    let globals_memory_size = brillig.globals_memory_size.get(&func.id()).copied().unwrap_or(0);
+    // let globals_memory_size = brillig.globals_memory_size.get(&func.id()).copied();
     let mut entry_point = BrilligContext::new_entry_point_artifact(
         arguments,
         FunctionContext::return_values(func),
         func.id(),
         true,
-        brillig.globals_memory_size,
+        globals_memory_size,
     );
     entry_point.name = func.name().to_string();