Fix merge conflict and tests

Veridise · Oct 24, 2023 · c1ee0be · c1ee0be
1 parent db5ec42
commit c1ee0be
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 11 deletions.
diff --git a/circom/tests/loops/assign_in_loop_1.circom b/circom/tests/loops/assign_in_loop_1.circom
@@ -1,7 +1,6 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template Inner() {
     signal input in;

diff --git a/circom/tests/loops/fixed_idx_in_fixed_idx.circom b/circom/tests/loops/fixed_idx_in_fixed_idx.circom
@@ -1,7 +1,6 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 // This case initially triggered the "assert!(bucket_to_args.is_empty());" line in body_extractor.rs
 //  because the entire expression 'in[byte_order[i]]'' is replaced but the 'byte_order[i]' expression

diff --git a/circom/tests/loops/inner_conditional_11.circom b/circom/tests/loops/inner_conditional_11.circom
@@ -1,7 +1,6 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template Sigma() {
     signal input inp;

diff --git a/circom/tests/subcmps/mapped.circom b/circom/tests/subcmps/mapped.circom
@@ -2,7 +2,6 @@ pragma circom 2.0.0;
 
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template A(n) {
 	signal input a[n];

diff --git a/circom/tests/subcmps/mapped2.circom b/circom/tests/subcmps/mapped2.circom
@@ -2,7 +2,6 @@ pragma circom 2.0.0;
 
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template A(n) {
 	signal input a[n];

diff --git a/circom/tests/subcmps/mapped3.circom b/circom/tests/subcmps/mapped3.circom
@@ -1,7 +1,6 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template ArrayOp(q) {
     signal input inp[15];

diff --git a/circom/tests/subcmps/mapped4.circom b/circom/tests/subcmps/mapped4.circom
@@ -1,7 +1,6 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template MatrixOp(q) {
     signal input inp[5][3];

diff --git a/circom/tests/subcmps/subcmps3.circom b/circom/tests/subcmps/subcmps3.circom
@@ -1,7 +1,6 @@
 pragma circom 2.0.0;
 // REQUIRES: circom
 // RUN: rm -rf %t && mkdir %t && %circom --llvm -o %t %s | sed -n 's/.*Written successfully:.* \(.*\)/\1/p' | xargs cat | FileCheck %s --enable-var-scope
-// XFAIL:.*     // TEMPORARY: because EXTRACT_LOOP_BODY_TO_NEW_FUNC == false
 
 template Sum(n) {
     signal input inp[n];

diff --git a/circuit_passes/src/passes/unused_func_removal.rs b/circuit_passes/src/passes/unused_func_removal.rs
@@ -157,9 +157,11 @@ impl CircuitTransformationPass for UnusedFuncRemovalPass<'_> {
         Circuit {
             wasm_producer: circuit.wasm_producer.clone(),
             c_producer: circuit.c_producer.clone(),
-            llvm_data: circuit
-                .llvm_data
-                .clone_with_new_field_tracking(circuit.llvm_data.field_tracking.clone()),
+            llvm_data: circuit.llvm_data.clone_with_updates(
+                circuit.llvm_data.field_tracking.clone(),
+                self.get_updated_bounded_array_loads(&circuit.llvm_data.bounded_array_loads),
+                self.get_updated_bounded_array_stores(&circuit.llvm_data.bounded_array_stores),
+            ),
             templates,
             functions,
         }