From 159f50e189210491d625175785c0a6cdac27cf52 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 24 Nov 2020 23:25:42 +0000
Subject: [PATCH] Turn on semantic tests for the old codegen where possible

These were marked IR-only, but they do pass on the old codegen too.

Also add old codegen version of semantictests/revertStrings/function_entry_checks.
---
 .../array/copying/array_copy_clear_storage_packed.sol  |  2 +-
 .../constructor_ihneritance_init_order_2.sol           |  2 +-
 .../semanticTests/freeFunctions/free_runtimecode.sol   |  2 +-
 .../semanticTests/freeFunctions/new_operator.sol       |  2 +-
 .../revertStrings/function_entry_checks_v1.sol         | 10 ++++++++++
 .../revertStrings/function_entry_checks_v1_abiv2.sol   | 10 ++++++++++
 ...n_entry_checks.sol => function_entry_checks_v2.sol} |  0
 .../semanticTests/viaYul/array_memory_as_parameter.sol |  2 +-
 .../semanticTests/viaYul/array_memory_create.sol       |  2 +-
 .../semanticTests/viaYul/array_memory_index_access.sol |  2 +-
 .../viaYul/array_storage_index_access.sol              |  2 +-
 .../viaYul/array_storage_index_boundary_test.sol       |  2 +-
 .../viaYul/array_storage_index_zeroed_test.sol         |  2 +-
 .../viaYul/array_storage_length_access.sol             |  2 +-
 .../viaYul/array_storage_pop_zero_length.sol           |  2 +-
 .../semanticTests/viaYul/array_storage_push_empty.sol  |  2 +-
 .../viaYul/array_storage_push_empty_length_address.sol |  2 +-
 .../semanticTests/viaYul/array_storage_push_pop.sol    |  2 +-
 test/libsolidity/semanticTests/viaYul/assert.sol       |  2 +-
 .../semanticTests/viaYul/assert_and_require.sol        |  2 +-
 test/libsolidity/semanticTests/viaYul/comparison.sol   |  2 +-
 .../semanticTests/viaYul/comparison_functions.sol      |  6 ++++--
 .../viaYul/conversion/explicit_cast_assignment.sol     |  2 +-
 .../viaYul/conversion/explicit_cast_function_call.sol  |  2 +-
 .../conversion/explicit_cast_local_assignment.sol      |  2 +-
 .../viaYul/conversion/implicit_cast_assignment.sol     |  2 +-
 .../viaYul/conversion/implicit_cast_function_call.sol  |  2 +-
 .../conversion/implicit_cast_local_assignment.sol      |  2 +-
 test/libsolidity/semanticTests/viaYul/delete.sol       |  2 +-
 .../semanticTests/viaYul/function_entry_checks.sol     |  2 +-
 test/libsolidity/semanticTests/viaYul/if.sol           |  2 +-
 test/libsolidity/semanticTests/viaYul/keccak.sol       |  2 +-
 .../semanticTests/viaYul/local_address_assignment.sol  |  2 +-
 .../semanticTests/viaYul/local_assignment.sol          |  2 +-
 .../semanticTests/viaYul/local_bool_assignment.sol     |  2 +-
 test/libsolidity/semanticTests/viaYul/loops/break.sol  |  2 +-
 .../semanticTests/viaYul/loops/continue.sol            |  2 +-
 test/libsolidity/semanticTests/viaYul/loops/return.sol |  2 +-
 test/libsolidity/semanticTests/viaYul/loops/simple.sol |  2 +-
 .../semanticTests/viaYul/mapping_string_key.sol        |  2 +-
 test/libsolidity/semanticTests/viaYul/msg_sender.sol   |  2 +-
 test/libsolidity/semanticTests/viaYul/return.sol       |  2 +-
 .../semanticTests/viaYul/return_and_convert.sol        |  2 +-
 .../libsolidity/semanticTests/viaYul/short_circuit.sol |  2 +-
 .../semanticTests/viaYul/simple_assignment.sol         |  2 +-
 .../semanticTests/viaYul/simple_inline_asm.sol         |  2 +-
 test/libsolidity/semanticTests/viaYul/smoke_test.sol   |  2 +-
 .../semanticTests/viaYul/storage/mappings.sol          |  2 +-
 .../semanticTests/viaYul/storage/packed_storage.sol    |  2 +-
 .../semanticTests/viaYul/storage/simple_storage.sol    |  2 +-
 .../libsolidity/semanticTests/viaYul/string_format.sol |  2 +-
 .../semanticTests/viaYul/string_literals.sol           |  2 +-
 .../semanticTests/viaYul/various_inline_asm.sol        |  2 +-
 .../semanticTests/viaYul/virtual_functions.sol         |  2 +-
 54 files changed, 74 insertions(+), 52 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
 create mode 100644 test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1_abiv2.sol
 rename test/libsolidity/semanticTests/revertStrings/{function_entry_checks.sol => function_entry_checks_v2.sol} (100%)

diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
index 1be4c3931..2118a854d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
@@ -39,7 +39,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // f() -> 0
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol
index 487dad3ec..de3529f77 100644
--- a/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol
@@ -8,7 +8,7 @@ contract B is A {
     uint public y = f();
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
index a79d68a3c..5c2e2f909 100644
--- a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
@@ -12,6 +12,6 @@ contract D {
   }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
index 7a7e53759..d0eea9f96 100644
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
@@ -12,6 +12,6 @@ contract D {
   }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
new file mode 100644
index 000000000..e10cb267c
--- /dev/null
+++ b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
@@ -0,0 +1,10 @@
+pragma abicoder v1;
+contract C {
+    function t(uint) public pure {}
+}
+// ====
+// EVMVersion: >=byzantium
+// compileViaYul: false
+// revertStrings: debug
+// ----
+// t(uint256) -> FAILURE, hex"08c379a0", 0x20, 0x12, "Calldata too short"
diff --git a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1_abiv2.sol b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1_abiv2.sol
new file mode 100644
index 000000000..dc7c169b9
--- /dev/null
+++ b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1_abiv2.sol
@@ -0,0 +1,10 @@
+pragma abicoder v2;
+contract C {
+    function t(uint) public pure {}
+}
+// ====
+// EVMVersion: >=byzantium
+// compileViaYul: false
+// revertStrings: debug
+// ----
+// t(uint256) -> FAILURE, hex"08c379a0", 0x20, 34, "ABI decoding: tuple data too sho", "rt"
diff --git a/test/libsolidity/semanticTests/revertStrings/function_entry_checks.sol b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/revertStrings/function_entry_checks.sol
rename to test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol b/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
index eb1a60d4f..1b51b8257 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
@@ -18,7 +18,7 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // test(uint256,uint256): 0,0 -> FAILURE
 // test(uint256,uint256): 1,0 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol b/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
index 9b2a33442..d1a9c5e2e 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
@@ -6,7 +6,7 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // create(uint256): 0 -> 0
 // create(uint256): 7 -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 0ec85912c..1e0a3d1c3 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -22,7 +22,7 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // index(uint256): 0 -> true
 // index(uint256): 10 -> true
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index d286fc36c..efc67e517 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -14,7 +14,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
index 5fe4a381d..6bd05f219 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
@@ -10,7 +10,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // test_boundary_check(uint256, uint256): 10, 11 -> FAILURE
 // test_boundary_check(uint256, uint256): 10, 9 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index c0ae21681..e02dc027d 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -50,7 +50,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
index 266c5ae3b..95ca92782 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
@@ -7,7 +7,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // set_get_length(uint256): 0 -> 0
 // set_get_length(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol b/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
index 932a4d642..d7f05f6fd 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
@@ -6,6 +6,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=petersburg
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // popEmpty() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index e692b273a..432ab243b 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // EVMVersion: >=petersburg
 // ----
 // pushEmpty(uint256): 128
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
index 7f9bd82dd..e28106443 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
@@ -10,7 +10,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // EVMVersion: >=petersburg
 // ----
 // set_get_length(uint256): 0 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index 3dce6216f..e40223908 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // set_get_length(uint256): 0 -> 0
 // set_get_length(uint256): 1 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/assert.sol b/test/libsolidity/semanticTests/viaYul/assert.sol
index 0b57fede7..d8dc409ec 100644
--- a/test/libsolidity/semanticTests/viaYul/assert.sol
+++ b/test/libsolidity/semanticTests/viaYul/assert.sol
@@ -14,7 +14,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(bool): true -> true
diff --git a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol b/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
index e12b0e145..bf50811a0 100644
--- a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
+++ b/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
@@ -11,7 +11,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(bool): true -> true
diff --git a/test/libsolidity/semanticTests/viaYul/comparison.sol b/test/libsolidity/semanticTests/viaYul/comparison.sol
index c42ae6df9..aa520f53b 100644
--- a/test/libsolidity/semanticTests/viaYul/comparison.sol
+++ b/test/libsolidity/semanticTests/viaYul/comparison.sol
@@ -37,7 +37,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // f(address): 0x1234 -> false
 // f(address): 0x00 -> true
diff --git a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol b/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
index 3ea94fe09..f0b07ba3b 100644
--- a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
+++ b/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
@@ -1,9 +1,11 @@
 contract C {
+	// If these two functions are identical, the optimiser
+	// on the old codegen path can deduplicate them, and breaking the test.
 	function internal1() internal pure returns (bool) {
 		return true;
 	}
 	function internal2() internal pure returns (bool) {
-		return true;
+		return false;
 	}
 
 	function equal() public pure returns (bool same, bool diff, bool inv) {
@@ -23,7 +25,7 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // equal() -> true, false, false
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
index 6c5221105..41e8e5002 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
index e160db631..67a831de9 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
@@ -7,7 +7,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // g() -> 0x1234567800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
index d90f9bbd8..a857d86c0 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256): 0x12345678 -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
index 08ba9e962..60e553d0b 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
index a94ad2097..1588adef5 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
@@ -12,7 +12,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // g() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
index 49c1e9252..ebae02779 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
@@ -8,7 +8,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/delete.sol b/test/libsolidity/semanticTests/viaYul/delete.sol
index eb2a0708a..e97f8cb80 100644
--- a/test/libsolidity/semanticTests/viaYul/delete.sol
+++ b/test/libsolidity/semanticTests/viaYul/delete.sol
@@ -19,7 +19,7 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // call_deleted_internal_func() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol b/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
index 434b21f7d..44466d911 100644
--- a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
@@ -17,7 +17,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/if.sol b/test/libsolidity/semanticTests/viaYul/if.sol
index 85afad75b..49c9453b8 100644
--- a/test/libsolidity/semanticTests/viaYul/if.sol
+++ b/test/libsolidity/semanticTests/viaYul/if.sol
@@ -60,7 +60,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(bool): 0 -> 23
diff --git a/test/libsolidity/semanticTests/viaYul/keccak.sol b/test/libsolidity/semanticTests/viaYul/keccak.sol
index 58c37ebd6..1befe8f7c 100644
--- a/test/libsolidity/semanticTests/viaYul/keccak.sol
+++ b/test/libsolidity/semanticTests/viaYul/keccak.sol
@@ -8,7 +8,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // keccak1() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
 // keccak2() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
diff --git a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
index 647e81f9e..438108da3 100644
--- a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(address): 0x1234 -> 0x1234
diff --git a/test/libsolidity/semanticTests/viaYul/local_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_assignment.sol
index 9524b009e..cdb84c3cb 100644
--- a/test/libsolidity/semanticTests/viaYul/local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_assignment.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256): 6 -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
index fab0cfd85..4b1371f33 100644
--- a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(bool): true -> true
diff --git a/test/libsolidity/semanticTests/viaYul/loops/break.sol b/test/libsolidity/semanticTests/viaYul/loops/break.sol
index 349085be4..2f683c0cf 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/break.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/break.sol
@@ -24,7 +24,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/loops/continue.sol b/test/libsolidity/semanticTests/viaYul/loops/continue.sol
index f63cfd632..14e5ca5f4 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/continue.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/continue.sol
@@ -30,7 +30,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 11
diff --git a/test/libsolidity/semanticTests/viaYul/loops/return.sol b/test/libsolidity/semanticTests/viaYul/loops/return.sol
index 3a734c83e..b8ced9fe6 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/return.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/return.sol
@@ -27,7 +27,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/loops/simple.sol b/test/libsolidity/semanticTests/viaYul/loops/simple.sol
index 0dbd5e113..b42f79c44 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/simple.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/simple.sol
@@ -30,7 +30,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 1024
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol b/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
index 880522d60..299f790ce 100644
--- a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
+++ b/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
@@ -5,6 +5,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // set(string): 0x20, 32, "01234567890123456789012345678901" ->
diff --git a/test/libsolidity/semanticTests/viaYul/msg_sender.sol b/test/libsolidity/semanticTests/viaYul/msg_sender.sol
index ae5468059..5ce5b530b 100644
--- a/test/libsolidity/semanticTests/viaYul/msg_sender.sol
+++ b/test/libsolidity/semanticTests/viaYul/msg_sender.sol
@@ -6,7 +6,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/return.sol b/test/libsolidity/semanticTests/viaYul/return.sol
index 98d4ff97c..1b5a983c1 100644
--- a/test/libsolidity/semanticTests/viaYul/return.sol
+++ b/test/libsolidity/semanticTests/viaYul/return.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol b/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
index 85f105575..082dc4048 100644
--- a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
+++ b/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
@@ -6,7 +6,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 255
diff --git a/test/libsolidity/semanticTests/viaYul/short_circuit.sol b/test/libsolidity/semanticTests/viaYul/short_circuit.sol
index bc7288767..7acb4cbfd 100644
--- a/test/libsolidity/semanticTests/viaYul/short_circuit.sol
+++ b/test/libsolidity/semanticTests/viaYul/short_circuit.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // or(uint256): 0 -> true, 0
diff --git a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol b/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
index 67c2de9be..0d54426a9 100644
--- a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256,uint256): 5, 6 -> 5, 6
diff --git a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
index 57080cef7..a2aec51df 100644
--- a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
+++ b/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
@@ -12,7 +12,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/smoke_test.sol b/test/libsolidity/semanticTests/viaYul/smoke_test.sol
index 3c58bbd1c..7acfd831a 100644
--- a/test/libsolidity/semanticTests/viaYul/smoke_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/smoke_test.sol
@@ -1,7 +1,7 @@
 contract C {
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // allowNonExistingFunctions: true
 // ----
diff --git a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol b/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
index 4713a42d3..92cba4eaa 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
@@ -29,7 +29,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // ----
 // test_simple(uint256): 0 -> 3, 4, 5
 // test_simple(uint256): 1 -> 3, 4, 5
diff --git a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
index 340da2963..15d04fff3 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
@@ -11,7 +11,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint8): 6 -> 9
diff --git a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
index 32016a624..6c5143534 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
@@ -11,7 +11,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // setX(uint256): 6 -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/string_format.sol b/test/libsolidity/semanticTests/viaYul/string_format.sol
index 8723c2fc7..669de6e9a 100644
--- a/test/libsolidity/semanticTests/viaYul/string_format.sol
+++ b/test/libsolidity/semanticTests/viaYul/string_format.sol
@@ -5,7 +5,7 @@ contract C {
 	function h() external pure returns (bytes4) { return 0xcafecafe; }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f1() -> 0x20, 6, left(0x616263616263)
diff --git a/test/libsolidity/semanticTests/viaYul/string_literals.sol b/test/libsolidity/semanticTests/viaYul/string_literals.sol
index 746c5fd30..57682e20a 100644
--- a/test/libsolidity/semanticTests/viaYul/string_literals.sol
+++ b/test/libsolidity/semanticTests/viaYul/string_literals.sol
@@ -19,7 +19,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // short_dyn() -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
index 5ad0e7129..f3bcf56fc 100644
--- a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
+++ b/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
@@ -18,7 +18,7 @@ contract C {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 70
diff --git a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol b/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
index cb86c8933..45d4ccf46 100644
--- a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
+++ b/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
@@ -24,7 +24,7 @@ contract C is X {
     }
 }
 // ====
-// compileViaYul: true
+// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 3