Merge 094a831 into b23e85b

noir-lang · Dec 20, 2024 · be2e56c · be2e56c
2 parents b23e85b + 094a831
commit be2e56c
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 375 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/noirc_evaluator/src/ssa.rs b/compiler/noirc_evaluator/src/ssa.rs
@@ -157,7 +157,6 @@ fn optimize_all(builder: SsaBuilder, options: &SsaEvaluatorOptions) -> Result<Ss
     Ok(builder
         .run_pass(Ssa::defunctionalize, "Defunctionalization")
         .run_pass(Ssa::remove_paired_rc, "Removing Paired rc_inc & rc_decs")
-        .run_pass(Ssa::separate_runtime, "Runtime Separation")
         .run_pass(Ssa::resolve_is_unconstrained, "Resolving IsUnconstrained")
         .run_pass(|ssa| ssa.inline_functions(options.inliner_aggressiveness), "Inlining (1st)")
         // Run mem2reg with the CFG separated into blocks

diff --git a/compiler/noirc_evaluator/src/ssa/opt/mod.rs b/compiler/noirc_evaluator/src/ssa/opt/mod.rs
@@ -21,7 +21,6 @@ mod remove_bit_shifts;
 mod remove_enable_side_effects;
 mod remove_if_else;
 mod resolve_is_unconstrained;
-mod runtime_separation;
 mod simplify_cfg;
 mod unrolling;
 

diff --git a/compiler/noirc_evaluator/src/ssa/opt/runtime_separation.rs b/compiler/noirc_evaluator/src/ssa/opt/runtime_separation.rs
diff --git a/compiler/noirc_frontend/Cargo.toml b/compiler/noirc_frontend/Cargo.toml
@@ -31,6 +31,7 @@ petgraph = "0.6"
 rangemap = "1.4.0"
 strum.workspace = true
 strum_macros.workspace = true
+fxhash.workspace = true
 
 
 [dev-dependencies]