Merge remote-tracking branch 'origin/trunk' into refcount

cli/src/repl.rs

@@ -259,7 +259,6 @@ pub fn gen(src: &[u8], target: Triple, opt_level: OptLevel) -> Result<(String, S
         problems: &mut mono_problems,
         home,
         ident_ids: &mut ident_ids,
-        jump_counter: arena.alloc(0),
     };
 
     let main_body = roc_mono::ir::Stmt::new(&mut mono_env, loc_expr.value, &mut procs);

compiler/build/src/program.rs

@@ -169,7 +169,6 @@ pub fn gen(
         problems: &mut mono_problems,
         home,
         ident_ids: &mut ident_ids,
-        jump_counter: arena.alloc(0),
     };
 
     // Add modules' decls to Procs

compiler/gen/tests/helpers/eval.rs

@@ -103,7 +103,6 @@ pub fn helper_without_uniqueness<'a>(
         problems: &mut mono_problems,
         home,
         ident_ids: &mut ident_ids,
-        jump_counter: arena.alloc(0),
     };
 
     let main_body = roc_mono::ir::Stmt::new(&mut mono_env, loc_expr.value, &mut procs);
@@ -295,7 +294,6 @@ pub fn helper_with_uniqueness<'a>(
         problems: &mut mono_problems,
         home,
         ident_ids: &mut ident_ids,
-        jump_counter: arena.alloc(0),
     };
 
     let main_body = roc_mono::ir::Stmt::new(&mut mono_env, loc_expr.value, &mut procs);

compiler/mono/src/decision_tree.rs

@@ -910,7 +910,7 @@ pub fn optimize_when<'a>(
 
     let choice_decider = insert_choices(&choices, decider);
 
-    let expr = decide_to_branching(
+    decide_to_branching(
         env,
         procs,
         layout_cache,
@@ -919,12 +919,7 @@ pub fn optimize_when<'a>(
         ret_layout,
         choice_decider,
         &jumps,
-    );
+    )
-
-    // increase the jump counter by the number of jumps in this branching structure
-    *env.jump_counter += jumps.len() as u64;
-
-    expr
 }
 
 fn path_to_expr<'a>(

compiler/mono/src/ir.rs

@@ -306,7 +306,6 @@ pub struct Env<'a, 'i> {
     pub problems: &'i mut std::vec::Vec<MonoProblem>,
     pub home: ModuleId,
     pub ident_ids: &'i mut IdentIds,
-    pub jump_counter: &'a mut u64,
 }
 
 impl<'a, 'i> Env<'a, 'i> {

compiler/mono/tests/test_mono.rs

@@ -58,7 +58,6 @@ mod test_mono {
             problems: &mut mono_problems,
             home,
             ident_ids: &mut ident_ids,
-            jump_counter: arena.alloc(0),
         };
 
         let mut layout_cache = LayoutCache::default();

compiler/reporting/tests/test_reporting.rs

@@ -93,7 +93,6 @@ mod test_reporting {
                 problems: &mut mono_problems,
                 home,
                 ident_ids: &mut ident_ids,
-                jump_counter: arena.alloc(0),
             };
             let _mono_expr = Stmt::new(&mut mono_env, loc_expr.value, &mut procs);
         }