Merge branch 'master' into tf/is-zero-acir-var

noir-lang · Dec 1, 2023 · 6b2169d · 6b2169d
2 parents 7ff06a3 + 5a4a73d
commit 6b2169d
Show file tree

Hide file tree

Showing 273 changed files with 11 additions and 29 deletions.
diff --git a/.github/workflows/auto-pr-rebuild-script.yml → .github/workflows/acir-artifacts.yml b/.github/workflows/auto-pr-rebuild-script.yml → .github/workflows/acir-artifacts.yml
@@ -1,4 +1,4 @@
-name: Rebuild ACIR artifacts
+name: Build ACIR artifacts
 
 on:
   pull_request:
@@ -93,11 +93,6 @@ jobs:
           chmod +x ${{ github.workspace }}/nargo/nargo
           echo "${{ github.workspace }}/nargo" >> $GITHUB_PATH
 
-      - name: Set up Git user (Github Action)
-        run: |
-          git config --local user.name kevaundray
-          git config --local user.email [email protected]
-
       - name: Run rebuild script
         working-directory: test_programs
         run: |
@@ -110,21 +105,3 @@ jobs:
           name: acir-artifacts
           path: ./test_programs/acir_artifacts
           retention-days: 10
-
-      - name: Check for changes in acir_artifacts directory
-        id: check_changes
-        if: ${{ github.ref_name }} == "master"
-        run: |
-          git diff --quiet test_programs/acir_artifacts/ || echo "::set-output name=changes::true"
-          
-      - name: Create or Update PR
-        if: steps.check_changes.outputs.changes == 'true'
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.NOIR_REPO_TOKEN }}
-          commit-message: "chore: update acir artifacts"
-          title: "chore: Update ACIR artifacts"
-          body: "Automatic PR to update acir artifacts"
-          add-paths: test_programs/acir_artifacts/*.gz
-          labels: "auto-pr"
-          branch: "auto-pr-rebuild-script-branch"
diff --git a/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs b/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
@@ -959,7 +959,8 @@ impl AcirContext {
     /// Converts the `AcirVar` to a `Witness` if it hasn't been already, and appends it to the
     /// `GeneratedAcir`'s return witnesses.
     pub(crate) fn return_var(&mut self, acir_var: AcirVar) -> Result<(), InternalError> {
-        let witness = self.var_to_witness(acir_var)?;
+        let return_var = self.get_or_create_witness_var(acir_var)?;
+        let witness = self.var_to_witness(return_var)?;
         self.acir_ir.push_return_witness(witness);
         Ok(())
     }
@@ -1507,7 +1508,8 @@ impl AcirContext {
         index: &AcirVar,
     ) -> Result<AcirVar, InternalError> {
         // Fetch the witness corresponding to the index
-        let index_witness = self.var_to_witness(*index)?;
+        let index_var = self.get_or_create_witness_var(*index)?;
+        let index_witness = self.var_to_witness(index_var)?;
 
         // Create a Variable to hold the result of the read and extract the corresponding Witness
         let value_read_var = self.add_variable();
@@ -1528,11 +1530,12 @@ impl AcirContext {
         value: &AcirVar,
     ) -> Result<(), InternalError> {
         // Fetch the witness corresponding to the index
-        //
-        let index_witness = self.var_to_witness(*index)?;
+        let index_var = self.get_or_create_witness_var(*index)?;
+        let index_witness = self.var_to_witness(index_var)?;
 
         // Fetch the witness corresponding to the value to be written
-        let value_write_witness = self.var_to_witness(*value)?;
+        let value_write_var = self.get_or_create_witness_var(*value)?;
+        let value_write_witness = self.var_to_witness(value_write_var)?;
 
         // Add the memory write operation to the list of opcodes
         let op = MemOp::write_to_mem_index(index_witness.into(), value_write_witness.into());
@@ -1574,6 +1577,7 @@ impl AcirContext {
     ) -> Result<(), InternalError> {
         match input {
             AcirValue::Var(var, _) => {
+                let var = self.get_or_create_witness_var(var)?;
                 witnesses.push(self.var_to_witness(var)?);
             }
             AcirValue::Array(values) => {

diff --git a/test_programs/.gitignore b/test_programs/.gitignore
@@ -0,0 +1 @@
+acir_artifacts
diff --git a/test_programs/acir_artifacts/1327_concrete_in_generic/target/acir.gz b/test_programs/acir_artifacts/1327_concrete_in_generic/target/acir.gz
diff --git a/test_programs/acir_artifacts/1327_concrete_in_generic/target/witness.gz b/test_programs/acir_artifacts/1327_concrete_in_generic/target/witness.gz
diff --git a/test_programs/acir_artifacts/1_mul/target/acir.gz b/test_programs/acir_artifacts/1_mul/target/acir.gz
diff --git a/test_programs/acir_artifacts/1_mul/target/witness.gz b/test_programs/acir_artifacts/1_mul/target/witness.gz
diff --git a/test_programs/acir_artifacts/2_div/target/acir.gz b/test_programs/acir_artifacts/2_div/target/acir.gz
diff --git a/test_programs/acir_artifacts/2_div/target/witness.gz b/test_programs/acir_artifacts/2_div/target/witness.gz
diff --git a/test_programs/acir_artifacts/3_add/target/acir.gz b/test_programs/acir_artifacts/3_add/target/acir.gz
diff --git a/test_programs/acir_artifacts/3_add/target/witness.gz b/test_programs/acir_artifacts/3_add/target/witness.gz
diff --git a/test_programs/acir_artifacts/4_sub/target/acir.gz b/test_programs/acir_artifacts/4_sub/target/acir.gz
diff --git a/test_programs/acir_artifacts/4_sub/target/witness.gz b/test_programs/acir_artifacts/4_sub/target/witness.gz
diff --git a/test_programs/acir_artifacts/5_over/target/acir.gz b/test_programs/acir_artifacts/5_over/target/acir.gz
diff --git a/test_programs/acir_artifacts/5_over/target/witness.gz b/test_programs/acir_artifacts/5_over/target/witness.gz
diff --git a/test_programs/acir_artifacts/6/target/acir.gz b/test_programs/acir_artifacts/6/target/acir.gz
diff --git a/test_programs/acir_artifacts/6/target/witness.gz b/test_programs/acir_artifacts/6/target/witness.gz
diff --git a/test_programs/acir_artifacts/6_array/target/acir.gz b/test_programs/acir_artifacts/6_array/target/acir.gz
diff --git a/test_programs/acir_artifacts/6_array/target/witness.gz b/test_programs/acir_artifacts/6_array/target/witness.gz
diff --git a/test_programs/acir_artifacts/7/target/acir.gz b/test_programs/acir_artifacts/7/target/acir.gz
diff --git a/test_programs/acir_artifacts/7/target/witness.gz b/test_programs/acir_artifacts/7/target/witness.gz
diff --git a/test_programs/acir_artifacts/7_function/target/acir.gz b/test_programs/acir_artifacts/7_function/target/acir.gz
diff --git a/test_programs/acir_artifacts/7_function/target/witness.gz b/test_programs/acir_artifacts/7_function/target/witness.gz
diff --git a/test_programs/acir_artifacts/arithmetic_binary_operations/target/acir.gz b/test_programs/acir_artifacts/arithmetic_binary_operations/target/acir.gz
diff --git a/test_programs/acir_artifacts/arithmetic_binary_operations/target/witness.gz b/test_programs/acir_artifacts/arithmetic_binary_operations/target/witness.gz
diff --git a/test_programs/acir_artifacts/array_dynamic/target/acir.gz b/test_programs/acir_artifacts/array_dynamic/target/acir.gz
diff --git a/test_programs/acir_artifacts/array_dynamic/target/witness.gz b/test_programs/acir_artifacts/array_dynamic/target/witness.gz
diff --git a/test_programs/acir_artifacts/array_eq/target/acir.gz b/test_programs/acir_artifacts/array_eq/target/acir.gz
diff --git a/test_programs/acir_artifacts/array_eq/target/witness.gz b/test_programs/acir_artifacts/array_eq/target/witness.gz
diff --git a/test_programs/acir_artifacts/array_len/target/acir.gz b/test_programs/acir_artifacts/array_len/target/acir.gz
diff --git a/test_programs/acir_artifacts/array_len/target/witness.gz b/test_programs/acir_artifacts/array_len/target/witness.gz
diff --git a/test_programs/acir_artifacts/array_neq/target/acir.gz b/test_programs/acir_artifacts/array_neq/target/acir.gz
diff --git a/test_programs/acir_artifacts/array_neq/target/witness.gz b/test_programs/acir_artifacts/array_neq/target/witness.gz
diff --git a/test_programs/acir_artifacts/array_sort/target/acir.gz b/test_programs/acir_artifacts/array_sort/target/acir.gz
diff --git a/test_programs/acir_artifacts/array_sort/target/witness.gz b/test_programs/acir_artifacts/array_sort/target/witness.gz
diff --git a/test_programs/acir_artifacts/assert/target/acir.gz b/test_programs/acir_artifacts/assert/target/acir.gz
diff --git a/test_programs/acir_artifacts/assert/target/witness.gz b/test_programs/acir_artifacts/assert/target/witness.gz
diff --git a/test_programs/acir_artifacts/assert_statement/target/acir.gz b/test_programs/acir_artifacts/assert_statement/target/acir.gz
diff --git a/test_programs/acir_artifacts/assert_statement/target/witness.gz b/test_programs/acir_artifacts/assert_statement/target/witness.gz
diff --git a/test_programs/acir_artifacts/assign_ex/target/acir.gz b/test_programs/acir_artifacts/assign_ex/target/acir.gz
diff --git a/test_programs/acir_artifacts/assign_ex/target/witness.gz b/test_programs/acir_artifacts/assign_ex/target/witness.gz
diff --git a/test_programs/acir_artifacts/bit_and/target/acir.gz b/test_programs/acir_artifacts/bit_and/target/acir.gz
diff --git a/test_programs/acir_artifacts/bit_and/target/witness.gz b/test_programs/acir_artifacts/bit_and/target/witness.gz
diff --git a/test_programs/acir_artifacts/bit_shifts_comptime/target/acir.gz b/test_programs/acir_artifacts/bit_shifts_comptime/target/acir.gz
diff --git a/test_programs/acir_artifacts/bit_shifts_comptime/target/witness.gz b/test_programs/acir_artifacts/bit_shifts_comptime/target/witness.gz
diff --git a/test_programs/acir_artifacts/bit_shifts_runtime/target/acir.gz b/test_programs/acir_artifacts/bit_shifts_runtime/target/acir.gz
diff --git a/test_programs/acir_artifacts/bit_shifts_runtime/target/witness.gz b/test_programs/acir_artifacts/bit_shifts_runtime/target/witness.gz
diff --git a/test_programs/acir_artifacts/bool_not/target/acir.gz b/test_programs/acir_artifacts/bool_not/target/acir.gz
diff --git a/test_programs/acir_artifacts/bool_not/target/witness.gz b/test_programs/acir_artifacts/bool_not/target/witness.gz
diff --git a/test_programs/acir_artifacts/bool_or/target/acir.gz b/test_programs/acir_artifacts/bool_or/target/acir.gz
diff --git a/test_programs/acir_artifacts/bool_or/target/witness.gz b/test_programs/acir_artifacts/bool_or/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_acir_as_brillig/target/acir.gz b/test_programs/acir_artifacts/brillig_acir_as_brillig/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_acir_as_brillig/target/witness.gz b/test_programs/acir_artifacts/brillig_acir_as_brillig/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_arrays/target/acir.gz b/test_programs/acir_artifacts/brillig_arrays/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_arrays/target/witness.gz b/test_programs/acir_artifacts/brillig_arrays/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_assert/target/acir.gz b/test_programs/acir_artifacts/brillig_assert/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_assert/target/witness.gz b/test_programs/acir_artifacts/brillig_assert/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_blake2s/target/acir.gz b/test_programs/acir_artifacts/brillig_blake2s/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_blake2s/target/witness.gz b/test_programs/acir_artifacts/brillig_blake2s/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_calls/target/acir.gz b/test_programs/acir_artifacts/brillig_calls/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_calls/target/witness.gz b/test_programs/acir_artifacts/brillig_calls/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_calls_array/target/acir.gz b/test_programs/acir_artifacts/brillig_calls_array/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_calls_array/target/witness.gz b/test_programs/acir_artifacts/brillig_calls_array/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_calls_conditionals/target/acir.gz b/test_programs/acir_artifacts/brillig_calls_conditionals/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_calls_conditionals/target/witness.gz b/test_programs/acir_artifacts/brillig_calls_conditionals/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_conditional/target/acir.gz b/test_programs/acir_artifacts/brillig_conditional/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_conditional/target/witness.gz b/test_programs/acir_artifacts/brillig_conditional/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_ecdsa/target/acir.gz b/test_programs/acir_artifacts/brillig_ecdsa/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_ecdsa/target/witness.gz b/test_programs/acir_artifacts/brillig_ecdsa/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_fns_as_values/target/acir.gz b/test_programs/acir_artifacts/brillig_fns_as_values/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_fns_as_values/target/witness.gz b/test_programs/acir_artifacts/brillig_fns_as_values/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_hash_to_field/target/acir.gz b/test_programs/acir_artifacts/brillig_hash_to_field/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_hash_to_field/target/witness.gz b/test_programs/acir_artifacts/brillig_hash_to_field/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_identity_function/target/acir.gz b/test_programs/acir_artifacts/brillig_identity_function/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_identity_function/target/witness.gz b/test_programs/acir_artifacts/brillig_identity_function/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_keccak/target/acir.gz b/test_programs/acir_artifacts/brillig_keccak/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_keccak/target/witness.gz b/test_programs/acir_artifacts/brillig_keccak/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_loop/target/acir.gz b/test_programs/acir_artifacts/brillig_loop/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_loop/target/witness.gz b/test_programs/acir_artifacts/brillig_loop/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_nested_arrays/target/acir.gz b/test_programs/acir_artifacts/brillig_nested_arrays/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_nested_arrays/target/witness.gz b/test_programs/acir_artifacts/brillig_nested_arrays/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_nested_slices/target/acir.gz b/test_programs/acir_artifacts/brillig_nested_slices/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_nested_slices/target/witness.gz b/test_programs/acir_artifacts/brillig_nested_slices/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_not/target/acir.gz b/test_programs/acir_artifacts/brillig_not/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_not/target/witness.gz b/test_programs/acir_artifacts/brillig_not/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_oracle/target/acir.gz b/test_programs/acir_artifacts/brillig_oracle/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_oracle/target/witness.gz b/test_programs/acir_artifacts/brillig_oracle/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_pedersen/target/acir.gz b/test_programs/acir_artifacts/brillig_pedersen/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_pedersen/target/witness.gz b/test_programs/acir_artifacts/brillig_pedersen/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_recursion/target/acir.gz b/test_programs/acir_artifacts/brillig_recursion/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_recursion/target/witness.gz b/test_programs/acir_artifacts/brillig_recursion/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_references/target/acir.gz b/test_programs/acir_artifacts/brillig_references/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_references/target/witness.gz b/test_programs/acir_artifacts/brillig_references/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_scalar_mul/target/acir.gz b/test_programs/acir_artifacts/brillig_scalar_mul/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_scalar_mul/target/witness.gz b/test_programs/acir_artifacts/brillig_scalar_mul/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_schnorr/target/acir.gz b/test_programs/acir_artifacts/brillig_schnorr/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_schnorr/target/witness.gz b/test_programs/acir_artifacts/brillig_schnorr/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_sha256/target/acir.gz b/test_programs/acir_artifacts/brillig_sha256/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_sha256/target/witness.gz b/test_programs/acir_artifacts/brillig_sha256/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_slices/target/acir.gz b/test_programs/acir_artifacts/brillig_slices/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_slices/target/witness.gz b/test_programs/acir_artifacts/brillig_slices/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_to_be_bytes/target/acir.gz b/test_programs/acir_artifacts/brillig_to_be_bytes/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_to_be_bytes/target/witness.gz b/test_programs/acir_artifacts/brillig_to_be_bytes/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_to_bytes_integration/target/acir.gz b/test_programs/acir_artifacts/brillig_to_bytes_integration/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_to_bytes_integration/target/witness.gz b/test_programs/acir_artifacts/brillig_to_bytes_integration/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_to_le_bytes/target/acir.gz b/test_programs/acir_artifacts/brillig_to_le_bytes/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_to_le_bytes/target/witness.gz b/test_programs/acir_artifacts/brillig_to_le_bytes/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_top_level/target/acir.gz b/test_programs/acir_artifacts/brillig_top_level/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_top_level/target/witness.gz b/test_programs/acir_artifacts/brillig_top_level/target/witness.gz
diff --git a/test_programs/acir_artifacts/brillig_unitialised_arrays/target/acir.gz b/test_programs/acir_artifacts/brillig_unitialised_arrays/target/acir.gz
diff --git a/test_programs/acir_artifacts/brillig_unitialised_arrays/target/witness.gz b/test_programs/acir_artifacts/brillig_unitialised_arrays/target/witness.gz
diff --git a/test_programs/acir_artifacts/cast_bool/target/acir.gz b/test_programs/acir_artifacts/cast_bool/target/acir.gz
diff --git a/test_programs/acir_artifacts/cast_bool/target/witness.gz b/test_programs/acir_artifacts/cast_bool/target/witness.gz
diff --git a/test_programs/acir_artifacts/closures_mut_ref/target/acir.gz b/test_programs/acir_artifacts/closures_mut_ref/target/acir.gz
diff --git a/test_programs/acir_artifacts/closures_mut_ref/target/witness.gz b/test_programs/acir_artifacts/closures_mut_ref/target/witness.gz
diff --git a/test_programs/acir_artifacts/conditional_1/target/acir.gz b/test_programs/acir_artifacts/conditional_1/target/acir.gz
diff --git a/test_programs/acir_artifacts/conditional_1/target/witness.gz b/test_programs/acir_artifacts/conditional_1/target/witness.gz
diff --git a/test_programs/acir_artifacts/conditional_2/target/acir.gz b/test_programs/acir_artifacts/conditional_2/target/acir.gz
diff --git a/test_programs/acir_artifacts/conditional_2/target/witness.gz b/test_programs/acir_artifacts/conditional_2/target/witness.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_421/target/acir.gz b/test_programs/acir_artifacts/conditional_regression_421/target/acir.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_421/target/witness.gz b/test_programs/acir_artifacts/conditional_regression_421/target/witness.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_661/target/acir.gz b/test_programs/acir_artifacts/conditional_regression_661/target/acir.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_661/target/witness.gz b/test_programs/acir_artifacts/conditional_regression_661/target/witness.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_short_circuit/target/acir.gz b/test_programs/acir_artifacts/conditional_regression_short_circuit/target/acir.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_short_circuit/target/witness.gz b/test_programs/acir_artifacts/conditional_regression_short_circuit/target/witness.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_underflow/target/acir.gz b/test_programs/acir_artifacts/conditional_regression_underflow/target/acir.gz
diff --git a/test_programs/acir_artifacts/conditional_regression_underflow/target/witness.gz b/test_programs/acir_artifacts/conditional_regression_underflow/target/witness.gz
diff --git a/test_programs/acir_artifacts/custom_entry/target/acir.gz b/test_programs/acir_artifacts/custom_entry/target/acir.gz
diff --git a/test_programs/acir_artifacts/custom_entry/target/witness.gz b/test_programs/acir_artifacts/custom_entry/target/witness.gz
diff --git a/test_programs/acir_artifacts/debug_logs/target/acir.gz b/test_programs/acir_artifacts/debug_logs/target/acir.gz
diff --git a/test_programs/acir_artifacts/debug_logs/target/witness.gz b/test_programs/acir_artifacts/debug_logs/target/witness.gz
diff --git a/test_programs/acir_artifacts/diamond_deps_0/target/acir.gz b/test_programs/acir_artifacts/diamond_deps_0/target/acir.gz
diff --git a/test_programs/acir_artifacts/diamond_deps_0/target/witness.gz b/test_programs/acir_artifacts/diamond_deps_0/target/witness.gz
diff --git a/test_programs/acir_artifacts/distinct_keyword/target/acir.gz b/test_programs/acir_artifacts/distinct_keyword/target/acir.gz
diff --git a/test_programs/acir_artifacts/distinct_keyword/target/witness.gz b/test_programs/acir_artifacts/distinct_keyword/target/witness.gz
diff --git a/test_programs/acir_artifacts/double_verify_proof/target/acir.gz b/test_programs/acir_artifacts/double_verify_proof/target/acir.gz
diff --git a/test_programs/acir_artifacts/double_verify_proof/target/witness.gz b/test_programs/acir_artifacts/double_verify_proof/target/witness.gz
diff --git a/test_programs/acir_artifacts/ecdsa_secp256k1/target/acir.gz b/test_programs/acir_artifacts/ecdsa_secp256k1/target/acir.gz
diff --git a/test_programs/acir_artifacts/ecdsa_secp256k1/target/witness.gz b/test_programs/acir_artifacts/ecdsa_secp256k1/target/witness.gz
diff --git a/test_programs/acir_artifacts/ecdsa_secp256r1/target/acir.gz b/test_programs/acir_artifacts/ecdsa_secp256r1/target/acir.gz
diff --git a/test_programs/acir_artifacts/ecdsa_secp256r1/target/witness.gz b/test_programs/acir_artifacts/ecdsa_secp256r1/target/witness.gz
diff --git a/test_programs/acir_artifacts/eddsa/target/acir.gz b/test_programs/acir_artifacts/eddsa/target/acir.gz
diff --git a/test_programs/acir_artifacts/eddsa/target/witness.gz b/test_programs/acir_artifacts/eddsa/target/witness.gz
diff --git a/test_programs/acir_artifacts/field_attribute/target/acir.gz b/test_programs/acir_artifacts/field_attribute/target/acir.gz
diff --git a/test_programs/acir_artifacts/field_attribute/target/witness.gz b/test_programs/acir_artifacts/field_attribute/target/witness.gz
diff --git a/test_programs/acir_artifacts/generics/target/acir.gz b/test_programs/acir_artifacts/generics/target/acir.gz
diff --git a/test_programs/acir_artifacts/generics/target/witness.gz b/test_programs/acir_artifacts/generics/target/witness.gz
diff --git a/test_programs/acir_artifacts/global_consts/target/acir.gz b/test_programs/acir_artifacts/global_consts/target/acir.gz
diff --git a/test_programs/acir_artifacts/global_consts/target/witness.gz b/test_programs/acir_artifacts/global_consts/target/witness.gz
diff --git a/test_programs/acir_artifacts/hash_to_field/target/acir.gz b/test_programs/acir_artifacts/hash_to_field/target/acir.gz
diff --git a/test_programs/acir_artifacts/hash_to_field/target/witness.gz b/test_programs/acir_artifacts/hash_to_field/target/witness.gz
diff --git a/test_programs/acir_artifacts/higher_order_functions/target/acir.gz b/test_programs/acir_artifacts/higher_order_functions/target/acir.gz
diff --git a/test_programs/acir_artifacts/higher_order_functions/target/witness.gz b/test_programs/acir_artifacts/higher_order_functions/target/witness.gz
diff --git a/test_programs/acir_artifacts/if_else_chain/target/acir.gz b/test_programs/acir_artifacts/if_else_chain/target/acir.gz
diff --git a/test_programs/acir_artifacts/if_else_chain/target/witness.gz b/test_programs/acir_artifacts/if_else_chain/target/witness.gz
diff --git a/test_programs/acir_artifacts/import/target/acir.gz b/test_programs/acir_artifacts/import/target/acir.gz
diff --git a/test_programs/acir_artifacts/import/target/witness.gz b/test_programs/acir_artifacts/import/target/witness.gz
diff --git a/test_programs/acir_artifacts/integer_array_indexing/target/acir.gz b/test_programs/acir_artifacts/integer_array_indexing/target/acir.gz
diff --git a/test_programs/acir_artifacts/integer_array_indexing/target/witness.gz b/test_programs/acir_artifacts/integer_array_indexing/target/witness.gz
diff --git a/test_programs/acir_artifacts/keccak256/target/acir.gz b/test_programs/acir_artifacts/keccak256/target/acir.gz
diff --git a/test_programs/acir_artifacts/keccak256/target/witness.gz b/test_programs/acir_artifacts/keccak256/target/witness.gz
diff --git a/test_programs/acir_artifacts/main_bool_arg/target/acir.gz b/test_programs/acir_artifacts/main_bool_arg/target/acir.gz
diff --git a/test_programs/acir_artifacts/main_bool_arg/target/witness.gz b/test_programs/acir_artifacts/main_bool_arg/target/witness.gz
diff --git a/test_programs/acir_artifacts/merkle_insert/target/acir.gz b/test_programs/acir_artifacts/merkle_insert/target/acir.gz
diff --git a/test_programs/acir_artifacts/merkle_insert/target/witness.gz b/test_programs/acir_artifacts/merkle_insert/target/witness.gz
diff --git a/test_programs/acir_artifacts/mock_oracle/target/acir.gz b/test_programs/acir_artifacts/mock_oracle/target/acir.gz
diff --git a/test_programs/acir_artifacts/mock_oracle/target/witness.gz b/test_programs/acir_artifacts/mock_oracle/target/witness.gz
diff --git a/test_programs/acir_artifacts/modules/target/acir.gz b/test_programs/acir_artifacts/modules/target/acir.gz
diff --git a/test_programs/acir_artifacts/modules/target/witness.gz b/test_programs/acir_artifacts/modules/target/witness.gz
diff --git a/test_programs/acir_artifacts/modules_more/target/acir.gz b/test_programs/acir_artifacts/modules_more/target/acir.gz
diff --git a/test_programs/acir_artifacts/modules_more/target/witness.gz b/test_programs/acir_artifacts/modules_more/target/witness.gz
diff --git a/test_programs/acir_artifacts/modulus/target/acir.gz b/test_programs/acir_artifacts/modulus/target/acir.gz
diff --git a/test_programs/acir_artifacts/modulus/target/witness.gz b/test_programs/acir_artifacts/modulus/target/witness.gz
diff --git a/test_programs/acir_artifacts/nested_array_dynamic/target/acir.gz b/test_programs/acir_artifacts/nested_array_dynamic/target/acir.gz
diff --git a/test_programs/acir_artifacts/nested_array_dynamic/target/witness.gz b/test_programs/acir_artifacts/nested_array_dynamic/target/witness.gz
diff --git a/test_programs/acir_artifacts/nested_arrays_from_brillig/target/acir.gz b/test_programs/acir_artifacts/nested_arrays_from_brillig/target/acir.gz
diff --git a/test_programs/acir_artifacts/nested_arrays_from_brillig/target/witness.gz b/test_programs/acir_artifacts/nested_arrays_from_brillig/target/witness.gz
diff --git a/test_programs/acir_artifacts/nested_slice_dynamic/target/acir.gz b/test_programs/acir_artifacts/nested_slice_dynamic/target/acir.gz
diff --git a/test_programs/acir_artifacts/nested_slice_dynamic/target/witness.gz b/test_programs/acir_artifacts/nested_slice_dynamic/target/witness.gz
diff --git a/test_programs/acir_artifacts/pedersen_check/target/acir.gz b/test_programs/acir_artifacts/pedersen_check/target/acir.gz
diff --git a/test_programs/acir_artifacts/pedersen_check/target/witness.gz b/test_programs/acir_artifacts/pedersen_check/target/witness.gz
diff --git a/test_programs/acir_artifacts/poseidon_bn254_hash/target/acir.gz b/test_programs/acir_artifacts/poseidon_bn254_hash/target/acir.gz
diff --git a/test_programs/acir_artifacts/poseidon_bn254_hash/target/witness.gz b/test_programs/acir_artifacts/poseidon_bn254_hash/target/witness.gz
diff --git a/test_programs/acir_artifacts/poseidonsponge_x5_254/target/acir.gz b/test_programs/acir_artifacts/poseidonsponge_x5_254/target/acir.gz
diff --git a/test_programs/acir_artifacts/poseidonsponge_x5_254/target/witness.gz b/test_programs/acir_artifacts/poseidonsponge_x5_254/target/witness.gz
diff --git a/test_programs/acir_artifacts/pred_eq/target/acir.gz b/test_programs/acir_artifacts/pred_eq/target/acir.gz
diff --git a/test_programs/acir_artifacts/pred_eq/target/witness.gz b/test_programs/acir_artifacts/pred_eq/target/witness.gz
diff --git a/test_programs/acir_artifacts/references/target/acir.gz b/test_programs/acir_artifacts/references/target/acir.gz
diff --git a/test_programs/acir_artifacts/references/target/witness.gz b/test_programs/acir_artifacts/references/target/witness.gz
diff --git a/test_programs/acir_artifacts/regression/target/acir.gz b/test_programs/acir_artifacts/regression/target/acir.gz
diff --git a/test_programs/acir_artifacts/regression/target/witness.gz b/test_programs/acir_artifacts/regression/target/witness.gz
diff --git a/test_programs/acir_artifacts/regression_2854/target/acir.gz b/test_programs/acir_artifacts/regression_2854/target/acir.gz
diff --git a/test_programs/acir_artifacts/regression_2854/target/witness.gz b/test_programs/acir_artifacts/regression_2854/target/witness.gz
diff --git a/test_programs/acir_artifacts/regression_mem_op_predicate/target/acir.gz b/test_programs/acir_artifacts/regression_mem_op_predicate/target/acir.gz
diff --git a/test_programs/acir_artifacts/regression_mem_op_predicate/target/witness.gz b/test_programs/acir_artifacts/regression_mem_op_predicate/target/witness.gz
diff --git a/test_programs/acir_artifacts/regression_method_cannot_be_found/target/acir.gz b/test_programs/acir_artifacts/regression_method_cannot_be_found/target/acir.gz
diff --git a/test_programs/acir_artifacts/regression_method_cannot_be_found/target/witness.gz b/test_programs/acir_artifacts/regression_method_cannot_be_found/target/witness.gz
diff --git a/test_programs/acir_artifacts/scalar_mul/target/acir.gz b/test_programs/acir_artifacts/scalar_mul/target/acir.gz
diff --git a/test_programs/acir_artifacts/scalar_mul/target/witness.gz b/test_programs/acir_artifacts/scalar_mul/target/witness.gz
diff --git a/test_programs/acir_artifacts/schnorr/target/acir.gz b/test_programs/acir_artifacts/schnorr/target/acir.gz
diff --git a/test_programs/acir_artifacts/schnorr/target/witness.gz b/test_programs/acir_artifacts/schnorr/target/witness.gz
diff --git a/test_programs/acir_artifacts/sha256/target/acir.gz b/test_programs/acir_artifacts/sha256/target/acir.gz
diff --git a/test_programs/acir_artifacts/sha256/target/witness.gz b/test_programs/acir_artifacts/sha256/target/witness.gz
diff --git a/test_programs/acir_artifacts/sha2_byte/target/acir.gz b/test_programs/acir_artifacts/sha2_byte/target/acir.gz
diff --git a/test_programs/acir_artifacts/sha2_byte/target/witness.gz b/test_programs/acir_artifacts/sha2_byte/target/witness.gz
diff --git a/test_programs/acir_artifacts/signed_arithmetic/target/acir.gz b/test_programs/acir_artifacts/signed_arithmetic/target/acir.gz
diff --git a/test_programs/acir_artifacts/signed_arithmetic/target/witness.gz b/test_programs/acir_artifacts/signed_arithmetic/target/witness.gz
diff --git a/test_programs/acir_artifacts/signed_division/target/acir.gz b/test_programs/acir_artifacts/signed_division/target/acir.gz
diff --git a/test_programs/acir_artifacts/signed_division/target/witness.gz b/test_programs/acir_artifacts/signed_division/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_2d_array/target/acir.gz b/test_programs/acir_artifacts/simple_2d_array/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_2d_array/target/witness.gz b/test_programs/acir_artifacts/simple_2d_array/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_add_and_ret_arr/target/acir.gz b/test_programs/acir_artifacts/simple_add_and_ret_arr/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_add_and_ret_arr/target/witness.gz b/test_programs/acir_artifacts/simple_add_and_ret_arr/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_bitwise/target/acir.gz b/test_programs/acir_artifacts/simple_bitwise/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_bitwise/target/witness.gz b/test_programs/acir_artifacts/simple_bitwise/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_comparison/target/acir.gz b/test_programs/acir_artifacts/simple_comparison/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_comparison/target/witness.gz b/test_programs/acir_artifacts/simple_comparison/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_mut/target/acir.gz b/test_programs/acir_artifacts/simple_mut/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_mut/target/witness.gz b/test_programs/acir_artifacts/simple_mut/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_not/target/acir.gz b/test_programs/acir_artifacts/simple_not/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_not/target/witness.gz b/test_programs/acir_artifacts/simple_not/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_print/target/acir.gz b/test_programs/acir_artifacts/simple_print/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_print/target/witness.gz b/test_programs/acir_artifacts/simple_print/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_program_addition/target/acir.gz b/test_programs/acir_artifacts/simple_program_addition/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_program_addition/target/witness.gz b/test_programs/acir_artifacts/simple_program_addition/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_radix/target/acir.gz b/test_programs/acir_artifacts/simple_radix/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_radix/target/witness.gz b/test_programs/acir_artifacts/simple_radix/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_shield/target/acir.gz b/test_programs/acir_artifacts/simple_shield/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_shield/target/witness.gz b/test_programs/acir_artifacts/simple_shield/target/witness.gz
diff --git a/test_programs/acir_artifacts/simple_shift_left_right/target/acir.gz b/test_programs/acir_artifacts/simple_shift_left_right/target/acir.gz
diff --git a/test_programs/acir_artifacts/simple_shift_left_right/target/witness.gz b/test_programs/acir_artifacts/simple_shift_left_right/target/witness.gz
diff --git a/test_programs/acir_artifacts/slice_dynamic_index/target/acir.gz b/test_programs/acir_artifacts/slice_dynamic_index/target/acir.gz
diff --git a/test_programs/acir_artifacts/slice_dynamic_index/target/witness.gz b/test_programs/acir_artifacts/slice_dynamic_index/target/witness.gz
diff --git a/test_programs/acir_artifacts/slice_struct_field/target/acir.gz b/test_programs/acir_artifacts/slice_struct_field/target/acir.gz
diff --git a/test_programs/acir_artifacts/slice_struct_field/target/witness.gz b/test_programs/acir_artifacts/slice_struct_field/target/witness.gz
diff --git a/test_programs/acir_artifacts/slices/target/acir.gz b/test_programs/acir_artifacts/slices/target/acir.gz
diff --git a/test_programs/acir_artifacts/slices/target/witness.gz b/test_programs/acir_artifacts/slices/target/witness.gz
diff --git a/test_programs/acir_artifacts/strings/target/acir.gz b/test_programs/acir_artifacts/strings/target/acir.gz
diff --git a/test_programs/acir_artifacts/strings/target/witness.gz b/test_programs/acir_artifacts/strings/target/witness.gz
diff --git a/test_programs/acir_artifacts/struct/target/acir.gz b/test_programs/acir_artifacts/struct/target/acir.gz
diff --git a/test_programs/acir_artifacts/struct/target/witness.gz b/test_programs/acir_artifacts/struct/target/witness.gz
diff --git a/test_programs/acir_artifacts/struct_array_inputs/target/acir.gz b/test_programs/acir_artifacts/struct_array_inputs/target/acir.gz
diff --git a/test_programs/acir_artifacts/struct_array_inputs/target/witness.gz b/test_programs/acir_artifacts/struct_array_inputs/target/witness.gz
diff --git a/test_programs/acir_artifacts/struct_fields_ordering/target/acir.gz b/test_programs/acir_artifacts/struct_fields_ordering/target/acir.gz
diff --git a/test_programs/acir_artifacts/struct_fields_ordering/target/witness.gz b/test_programs/acir_artifacts/struct_fields_ordering/target/witness.gz
diff --git a/test_programs/acir_artifacts/struct_inputs/target/acir.gz b/test_programs/acir_artifacts/struct_inputs/target/acir.gz
diff --git a/test_programs/acir_artifacts/struct_inputs/target/witness.gz b/test_programs/acir_artifacts/struct_inputs/target/witness.gz
diff --git a/test_programs/acir_artifacts/submodules/target/acir.gz b/test_programs/acir_artifacts/submodules/target/acir.gz
diff --git a/test_programs/acir_artifacts/submodules/target/witness.gz b/test_programs/acir_artifacts/submodules/target/witness.gz
diff --git a/test_programs/acir_artifacts/to_be_bytes/target/acir.gz b/test_programs/acir_artifacts/to_be_bytes/target/acir.gz
diff --git a/test_programs/acir_artifacts/to_be_bytes/target/witness.gz b/test_programs/acir_artifacts/to_be_bytes/target/witness.gz
diff --git a/test_programs/acir_artifacts/to_bytes_consistent/target/acir.gz b/test_programs/acir_artifacts/to_bytes_consistent/target/acir.gz
diff --git a/test_programs/acir_artifacts/to_bytes_consistent/target/witness.gz b/test_programs/acir_artifacts/to_bytes_consistent/target/witness.gz
diff --git a/test_programs/acir_artifacts/to_bytes_integration/target/acir.gz b/test_programs/acir_artifacts/to_bytes_integration/target/acir.gz
diff --git a/test_programs/acir_artifacts/to_bytes_integration/target/witness.gz b/test_programs/acir_artifacts/to_bytes_integration/target/witness.gz
diff --git a/test_programs/acir_artifacts/to_le_bytes/target/acir.gz b/test_programs/acir_artifacts/to_le_bytes/target/acir.gz
diff --git a/test_programs/acir_artifacts/to_le_bytes/target/witness.gz b/test_programs/acir_artifacts/to_le_bytes/target/witness.gz
diff --git a/test_programs/acir_artifacts/trait_as_return_type/target/acir.gz b/test_programs/acir_artifacts/trait_as_return_type/target/acir.gz
diff --git a/test_programs/acir_artifacts/trait_as_return_type/target/witness.gz b/test_programs/acir_artifacts/trait_as_return_type/target/witness.gz
diff --git a/test_programs/acir_artifacts/trait_impl_base_type/target/acir.gz b/test_programs/acir_artifacts/trait_impl_base_type/target/acir.gz
diff --git a/test_programs/acir_artifacts/trait_impl_base_type/target/witness.gz b/test_programs/acir_artifacts/trait_impl_base_type/target/witness.gz
diff --git a/test_programs/acir_artifacts/traits_in_crates_1/target/acir.gz b/test_programs/acir_artifacts/traits_in_crates_1/target/acir.gz
diff --git a/test_programs/acir_artifacts/traits_in_crates_1/target/witness.gz b/test_programs/acir_artifacts/traits_in_crates_1/target/witness.gz
diff --git a/test_programs/acir_artifacts/traits_in_crates_2/target/acir.gz b/test_programs/acir_artifacts/traits_in_crates_2/target/acir.gz
diff --git a/test_programs/acir_artifacts/traits_in_crates_2/target/witness.gz b/test_programs/acir_artifacts/traits_in_crates_2/target/witness.gz
diff --git a/test_programs/acir_artifacts/tuple_inputs/target/acir.gz b/test_programs/acir_artifacts/tuple_inputs/target/acir.gz
diff --git a/test_programs/acir_artifacts/tuple_inputs/target/witness.gz b/test_programs/acir_artifacts/tuple_inputs/target/witness.gz
diff --git a/test_programs/acir_artifacts/tuples/target/acir.gz b/test_programs/acir_artifacts/tuples/target/acir.gz
diff --git a/test_programs/acir_artifacts/tuples/target/witness.gz b/test_programs/acir_artifacts/tuples/target/witness.gz
diff --git a/test_programs/acir_artifacts/type_aliases/target/acir.gz b/test_programs/acir_artifacts/type_aliases/target/acir.gz
diff --git a/test_programs/acir_artifacts/type_aliases/target/witness.gz b/test_programs/acir_artifacts/type_aliases/target/witness.gz
diff --git a/test_programs/acir_artifacts/xor/target/acir.gz b/test_programs/acir_artifacts/xor/target/acir.gz
diff --git a/test_programs/acir_artifacts/xor/target/witness.gz b/test_programs/acir_artifacts/xor/target/witness.gz