fix: Do not merge expressions that contain output witnesses (#6757)

noir-lang · Dec 10, 2024 · ceea6da · ceea6da
1 parent 0ba3e85
commit ceea6da
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/acvm-repo/acvm/src/compiler/mod.rs b/acvm-repo/acvm/src/compiler/mod.rs
@@ -82,6 +82,11 @@ pub fn compile<F: AcirField>(
     acir: Circuit<F>,
     expression_width: ExpressionWidth,
 ) -> (Circuit<F>, AcirTransformationMap) {
+    if MAX_OPTIMIZER_PASSES == 0 {
+        let acir_opcode_positions = (0..acir.opcodes.len()).collect::<Vec<_>>();
+        let transformation_map = AcirTransformationMap::new(&acir_opcode_positions);
+        return (acir, transformation_map);
+    }
     let mut pass = 0;
     let mut prev_opcodes_hash = fxhash::hash64(&acir.opcodes);
     let mut prev_acir = acir;

diff --git a/acvm-repo/acvm/src/compiler/optimizers/merge_expressions.rs b/acvm-repo/acvm/src/compiler/optimizers/merge_expressions.rs
@@ -41,16 +41,18 @@ impl<F: AcirField> MergeExpressionsOptimizer<F> {
         self.resolved_blocks.clear();
 
         // Keep track, for each witness, of the gates that use it
-        let circuit_inputs = circuit.circuit_arguments();
+        let circuit_io: BTreeSet<Witness> =
+            circuit.circuit_arguments().union(&circuit.public_inputs().0).cloned().collect();
+
         let mut used_witness: BTreeMap<Witness, BTreeSet<usize>> = BTreeMap::new();
         for (i, opcode) in circuit.opcodes.iter().enumerate() {
             let witnesses = self.witness_inputs(opcode);
             if let Opcode::MemoryInit { block_id, .. } = opcode {
                 self.resolved_blocks.insert(*block_id, witnesses.clone());
             }
             for w in witnesses {
-                // We do not simplify circuit inputs
-                if !circuit_inputs.contains(&w) {
+                // We do not simplify circuit inputs and outputs
+                if !circuit_io.contains(&w) {
                     used_witness.entry(w).or_default().insert(i);
                 }
             }
@@ -102,7 +104,7 @@ impl<F: AcirField> MergeExpressionsOptimizer<F> {
                                     let mut witness_list = CircuitSimulator::expr_wit(&expr_use);
                                     witness_list.extend(CircuitSimulator::expr_wit(&expr_define));
                                     for w2 in witness_list {
-                                        if !circuit_inputs.contains(&w2) {
+                                        if !circuit_io.contains(&w2) {
                                             used_witness.entry(w2).and_modify(|v| {
                                                 v.insert(target);
                                                 v.remove(&source);

diff --git a/acvm-repo/acvm/src/pwg/mod.rs b/acvm-repo/acvm/src/pwg/mod.rs
@@ -359,7 +359,6 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> ACVM<'a, F, B> {
 
     pub fn solve_opcode(&mut self) -> ACVMStatus<F> {
         let opcode = &self.opcodes[self.instruction_pointer];
-
         let resolution = match opcode {
             Opcode::AssertZero(expr) => ExpressionSolver::solve(&mut self.witness_map, expr),
             Opcode::BlackBoxFuncCall(bb_func) => blackbox::solve(