From 14170804fd50cc75f8f4a20727d4a7a1f3d40db4 Mon Sep 17 00:00:00 2001 From: Tom French Date: Sat, 21 Oct 2023 20:08:29 +0100 Subject: [PATCH 1/2] chore: move empty circuits to `compile_successs_empty` --- .../conditional_regression_547/Nargo.toml | 0 .../conditional_regression_547/Prover.toml | 0 .../conditional_regression_547/src/main.nr | 0 .../conditional_regression_579/Nargo.toml | 0 .../conditional_regression_579/Prover.toml | 0 .../conditional_regression_579/src/main.nr | 0 .../conditional_regression_to_bits/Nargo.toml | 0 .../Prover.toml | 0 .../src/main.nr | 0 .../main_return/Nargo.toml | 0 .../main_return/Prover.toml | 0 .../main_return/src/main.nr | 0 .../references_aliasing/src/main.nr | 27 ++++++++++++++--- .../simple_array_param/Nargo.toml | 0 .../simple_array_param/Prover.toml | 0 .../simple_array_param/src/main.nr | 0 .../Nargo.toml | 0 .../Prover.toml | 0 .../src/main.nr | 0 .../Nargo.toml | 0 .../Prover.toml | 0 .../src/main.nr | 0 .../trait_default_implementation/Nargo.toml | 0 .../trait_default_implementation/Prover.toml | 0 .../trait_default_implementation/src/main.nr | 0 .../trait_function_calls/Nargo.toml | 0 .../trait_function_calls}/Prover.toml | 0 .../trait_function_calls/src/main.nr | 0 .../trait_multi_module_test/Nargo.toml | 0 .../trait_multi_module_test}/Prover.toml | 0 .../trait_multi_module_test/src/main.nr | 0 .../trait_multi_module_test/src/module1.nr | 0 .../trait_multi_module_test/src/module2.nr | 0 .../trait_multi_module_test/src/module3.nr | 0 .../trait_multi_module_test/src/module4.nr | 0 .../trait_multi_module_test/src/module5.nr | 0 .../trait_multi_module_test/src/module6.nr | 0 .../trait_override_implementation/Nargo.toml | 0 .../trait_override_implementation/Prover.toml | 0 .../trait_override_implementation/src/main.nr | 0 .../trait_self/Nargo.toml | 0 .../trait_self/src/main.nr | 0 .../trait_self/trait_self/Nargo.toml | 0 .../trait_self/trait_self/src/main.nr | 0 .../trait_where_clause/Nargo.toml | 0 .../trait_where_clause/src/main.nr | 0 .../trait_where_clause/src/the_trait.nr | 0 .../references_aliasing/Nargo.toml | 7 ----- .../references_aliasing/src/main.nr | 29 ------------------- .../trait_multi_module_test/Prover.toml | 0 50 files changed, 23 insertions(+), 40 deletions(-) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_547/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_547/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_547/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_579/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_579/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_579/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_to_bits/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_to_bits/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/conditional_regression_to_bits/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/main_return/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/main_return/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/main_return/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/simple_array_param/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/simple_array_param/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/simple_array_param/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_allowed_item_name_matches/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success/references_aliasing => compile_success_empty/trait_allowed_item_name_matches}/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_allowed_item_name_matches/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_associated_member_names_clashes/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success/trait_allowed_item_name_matches => compile_success_empty/trait_associated_member_names_clashes}/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_associated_member_names_clashes/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_default_implementation/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_default_implementation/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_default_implementation/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_function_calls/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success/trait_associated_member_names_clashes => compile_success_empty/trait_function_calls}/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_function_calls/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success/trait_function_calls => compile_success_empty/trait_multi_module_test}/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/src/module1.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/src/module2.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/src/module3.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/src/module4.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/src/module5.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_multi_module_test/src/module6.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_override_implementation/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_override_implementation/Prover.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_override_implementation/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_self/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_self/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_self/trait_self/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_self/trait_self/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_where_clause/Nargo.toml (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_where_clause/src/main.nr (100%) rename tooling/nargo_cli/tests/{execution_success => compile_success_empty}/trait_where_clause/src/the_trait.nr (100%) delete mode 100644 tooling/nargo_cli/tests/execution_success/references_aliasing/Nargo.toml delete mode 100644 tooling/nargo_cli/tests/execution_success/references_aliasing/src/main.nr delete mode 100644 tooling/nargo_cli/tests/execution_success/trait_multi_module_test/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_547/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_547/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_547/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_547/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_547/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_547/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_547/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_547/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_547/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_547/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_547/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_547/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_579/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_579/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_579/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_579/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_579/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_579/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_579/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_579/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_579/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_579/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_579/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_579/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_to_bits/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_to_bits/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_to_bits/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_to_bits/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_to_bits/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_to_bits/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_to_bits/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_to_bits/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/conditional_regression_to_bits/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/conditional_regression_to_bits/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/conditional_regression_to_bits/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/conditional_regression_to_bits/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/main_return/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/main_return/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/main_return/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/main_return/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/main_return/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/main_return/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/main_return/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/main_return/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/main_return/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/main_return/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/main_return/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/main_return/src/main.nr diff --git a/tooling/nargo_cli/tests/compile_success_empty/references_aliasing/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/references_aliasing/src/main.nr index 4582444c8f7..02057732f35 100644 --- a/tooling/nargo_cli/tests/compile_success_empty/references_aliasing/src/main.nr +++ b/tooling/nargo_cli/tests/compile_success_empty/references_aliasing/src/main.nr @@ -1,10 +1,29 @@ -fn increment(mut r: &mut Field) { - *r = *r + 1; -} - fn main() { let mut x = 100; let mut xref = &mut x; increment(xref); assert(*xref == 101); + + regression_2445(); +} + +fn increment(mut r: &mut Field) { + *r = *r + 1; +} + +// If aliasing within arrays and constant folding within the mem2reg pass aren't +// handled, we'll fail to optimize out all the references in this function. +fn regression_2445() { + let mut var = 0; + let ref = &mut &mut var; + + let mut array = [ref, ref]; + + **array[0] = 1; + **array[1] = 2; + + assert(var == 2); + assert(**ref == 2); + assert(**array[0] == 2); + assert(**array[1] == 2); } diff --git a/tooling/nargo_cli/tests/execution_success/simple_array_param/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/simple_array_param/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/simple_array_param/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/simple_array_param/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/simple_array_param/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/simple_array_param/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/simple_array_param/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/simple_array_param/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/simple_array_param/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/simple_array_param/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/simple_array_param/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/simple_array_param/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_allowed_item_name_matches/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_allowed_item_name_matches/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_allowed_item_name_matches/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_allowed_item_name_matches/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/references_aliasing/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_allowed_item_name_matches/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/references_aliasing/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_allowed_item_name_matches/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_allowed_item_name_matches/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_allowed_item_name_matches/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_allowed_item_name_matches/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_allowed_item_name_matches/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_associated_member_names_clashes/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_associated_member_names_clashes/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_associated_member_names_clashes/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_associated_member_names_clashes/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_allowed_item_name_matches/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_associated_member_names_clashes/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_allowed_item_name_matches/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_associated_member_names_clashes/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_associated_member_names_clashes/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_associated_member_names_clashes/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_associated_member_names_clashes/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_associated_member_names_clashes/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_default_implementation/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_default_implementation/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_default_implementation/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_default_implementation/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_default_implementation/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_default_implementation/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_default_implementation/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_default_implementation/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_default_implementation/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_default_implementation/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_default_implementation/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_default_implementation/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_function_calls/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_function_calls/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_function_calls/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_function_calls/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_associated_member_names_clashes/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_function_calls/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_associated_member_names_clashes/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_function_calls/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_function_calls/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_function_calls/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_function_calls/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_function_calls/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_function_calls/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_function_calls/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module1.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module1.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module1.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module1.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module2.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module2.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module2.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module2.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module3.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module3.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module3.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module3.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module4.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module4.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module4.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module4.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module5.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module5.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module5.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module5.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module6.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module6.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_multi_module_test/src/module6.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_multi_module_test/src/module6.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_override_implementation/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_override_implementation/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_override_implementation/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_override_implementation/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_override_implementation/Prover.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_override_implementation/Prover.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_override_implementation/Prover.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_override_implementation/Prover.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_override_implementation/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_override_implementation/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_override_implementation/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_override_implementation/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_self/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_self/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_self/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_self/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_self/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_self/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_self/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_self/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_self/trait_self/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_self/trait_self/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_self/trait_self/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_self/trait_self/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_self/trait_self/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_self/trait_self/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_self/trait_self/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_self/trait_self/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_where_clause/Nargo.toml b/tooling/nargo_cli/tests/compile_success_empty/trait_where_clause/Nargo.toml similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_where_clause/Nargo.toml rename to tooling/nargo_cli/tests/compile_success_empty/trait_where_clause/Nargo.toml diff --git a/tooling/nargo_cli/tests/execution_success/trait_where_clause/src/main.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_where_clause/src/main.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_where_clause/src/main.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_where_clause/src/main.nr diff --git a/tooling/nargo_cli/tests/execution_success/trait_where_clause/src/the_trait.nr b/tooling/nargo_cli/tests/compile_success_empty/trait_where_clause/src/the_trait.nr similarity index 100% rename from tooling/nargo_cli/tests/execution_success/trait_where_clause/src/the_trait.nr rename to tooling/nargo_cli/tests/compile_success_empty/trait_where_clause/src/the_trait.nr diff --git a/tooling/nargo_cli/tests/execution_success/references_aliasing/Nargo.toml b/tooling/nargo_cli/tests/execution_success/references_aliasing/Nargo.toml deleted file mode 100644 index b95c3998483..00000000000 --- a/tooling/nargo_cli/tests/execution_success/references_aliasing/Nargo.toml +++ /dev/null @@ -1,7 +0,0 @@ -[package] -name = "references_aliasing" -type = "bin" -authors = [""] -compiler_version = "0.5.1" - -[dependencies] diff --git a/tooling/nargo_cli/tests/execution_success/references_aliasing/src/main.nr b/tooling/nargo_cli/tests/execution_success/references_aliasing/src/main.nr deleted file mode 100644 index 02057732f35..00000000000 --- a/tooling/nargo_cli/tests/execution_success/references_aliasing/src/main.nr +++ /dev/null @@ -1,29 +0,0 @@ -fn main() { - let mut x = 100; - let mut xref = &mut x; - increment(xref); - assert(*xref == 101); - - regression_2445(); -} - -fn increment(mut r: &mut Field) { - *r = *r + 1; -} - -// If aliasing within arrays and constant folding within the mem2reg pass aren't -// handled, we'll fail to optimize out all the references in this function. -fn regression_2445() { - let mut var = 0; - let ref = &mut &mut var; - - let mut array = [ref, ref]; - - **array[0] = 1; - **array[1] = 2; - - assert(var == 2); - assert(**ref == 2); - assert(**array[0] == 2); - assert(**array[1] == 2); -} diff --git a/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/Prover.toml b/tooling/nargo_cli/tests/execution_success/trait_multi_module_test/Prover.toml deleted file mode 100644 index e69de29bb2d..00000000000 From ec30c29b7a896a416f126cd31efc3eb4546fc467 Mon Sep 17 00:00:00 2001 From: Tom French Date: Mon, 23 Oct 2023 10:52:28 +0100 Subject: [PATCH 2/2] chore: update artifacts --- .../conditional_regression_547/target/acir.gz | Bin 39 -> 0 bytes .../conditional_regression_547/target/witness.gz | Bin 45 -> 0 bytes .../conditional_regression_579/target/acir.gz | Bin 24 -> 0 bytes .../conditional_regression_579/target/witness.gz | Bin 23 -> 0 bytes .../conditional_regression_to_bits/target/acir.gz | Bin 24 -> 0 bytes .../target/witness.gz | Bin 23 -> 0 bytes .../acir_artifacts/main_return/target/acir.gz | Bin 40 -> 0 bytes .../acir_artifacts/main_return/target/witness.gz | Bin 46 -> 0 bytes .../references_aliasing/target/acir.gz | Bin 24 -> 0 bytes .../references_aliasing/target/witness.gz | Bin 23 -> 0 bytes .../simple_array_param/target/acir.gz | Bin 42 -> 0 bytes .../simple_array_param/target/witness.gz | Bin 49 -> 0 bytes .../trait_allowed_item_name_matches/target/acir.gz | Bin 24 -> 0 bytes .../target/witness.gz | Bin 23 -> 0 bytes .../trait_as_return_type/target/acir.gz | Bin 0 -> 46 bytes .../target/witness.gz | Bin .../target/acir.gz | Bin 24 -> 0 bytes .../target/witness.gz | Bin 23 -> 0 bytes .../trait_default_implementation/target/acir.gz | Bin 38 -> 0 bytes .../trait_function_calls/target/acir.gz | Bin 24 -> 0 bytes .../trait_function_calls/target/witness.gz | Bin 23 -> 0 bytes .../trait_multi_module_test/target/acir.gz | Bin 24 -> 0 bytes .../trait_multi_module_test/target/witness.gz | Bin 23 -> 0 bytes .../trait_override_implementation/target/acir.gz | Bin 38 -> 0 bytes .../target/witness.gz | Bin 46 -> 0 bytes .../tests/acir_artifacts/trait_self/target/acir.gz | Bin 24 -> 0 bytes .../acir_artifacts/trait_self/target/witness.gz | Bin 23 -> 0 bytes .../trait_where_clause/target/acir.gz | Bin 24 -> 0 bytes .../trait_where_clause/target/witness.gz | Bin 23 -> 0 bytes 29 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/conditional_regression_547/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/conditional_regression_547/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/conditional_regression_579/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/conditional_regression_579/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/conditional_regression_to_bits/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/conditional_regression_to_bits/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/main_return/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/main_return/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/references_aliasing/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/references_aliasing/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/simple_array_param/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/simple_array_param/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_allowed_item_name_matches/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_allowed_item_name_matches/target/witness.gz create mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_as_return_type/target/acir.gz rename tooling/nargo_cli/tests/acir_artifacts/{trait_default_implementation => trait_as_return_type}/target/witness.gz (100%) delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_associated_member_names_clashes/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_associated_member_names_clashes/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_default_implementation/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_function_calls/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_function_calls/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_multi_module_test/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_multi_module_test/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_override_implementation/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_override_implementation/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_self/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_self/target/witness.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_where_clause/target/acir.gz delete mode 100644 tooling/nargo_cli/tests/acir_artifacts/trait_where_clause/target/witness.gz diff --git a/tooling/nargo_cli/tests/acir_artifacts/conditional_regression_547/target/acir.gz b/tooling/nargo_cli/tests/acir_artifacts/conditional_regression_547/target/acir.gz deleted file mode 100644 index 090578ca4e3da83386c1be71ed2b91b72b1de1ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 pcmb2|=3oGW|D`7maspXR2kz9roaeYe{^5y7d0~~pyID*36@Gu>`nUTHW-%61!jqLpWhAYnJKj#Ruwpb7XR0IGwrw*(D diff --git a/tooling/nargo_cli/tests/acir_artifacts/conditional_regression_579/target/acir.gz b/tooling/nargo_cli/tests/acir_artifacts/conditional_regression_579/target/acir.gz deleted file mode 100644 index 2639a2e0809384eac56475a35d011104cd4b4686..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 acmb2|=3oGW|H%moatsVIX)4V+Kmhh)Q@ef)6 diff --git a/tooling/nargo_cli/tests/acir_artifacts/simple_array_param/target/witness.gz b/tooling/nargo_cli/tests/acir_artifacts/simple_array_param/target/witness.gz deleted file mode 100644 index a8e277ea7959fc5fcbdad4fcdfabfc566b551e19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmb2|=3oE;rvGbuHgYmBa2(zu{*wJ){nVzv3wT+KSU*0od?VEO{wnwXPnod`fC>St C5))Yf diff --git a/tooling/nargo_cli/tests/acir_artifacts/trait_allowed_item_name_matches/target/acir.gz b/tooling/nargo_cli/tests/acir_artifacts/trait_allowed_item_name_matches/target/acir.gz deleted file mode 100644 index 2639a2e0809384eac56475a35d011104cd4b4686..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 acmb2|=3oGW|H%moatsVIX)4V+Kmh~&V6Et^^NuVX*=x7IUCwsy>$G(aKxF`J_7RT& literal 0 HcmV?d00001 diff --git a/tooling/nargo_cli/tests/acir_artifacts/trait_default_implementation/target/witness.gz b/tooling/nargo_cli/tests/acir_artifacts/trait_as_return_type/target/witness.gz similarity index 100% rename from tooling/nargo_cli/tests/acir_artifacts/trait_default_implementation/target/witness.gz rename to tooling/nargo_cli/tests/acir_artifacts/trait_as_return_type/target/witness.gz diff --git a/tooling/nargo_cli/tests/acir_artifacts/trait_associated_member_names_clashes/target/acir.gz b/tooling/nargo_cli/tests/acir_artifacts/trait_associated_member_names_clashes/target/acir.gz deleted file mode 100644 index 2639a2e0809384eac56475a35d011104cd4b4686..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 acmb2|=3oGW|H%moatsVIX)4V+Kmh