Merge pull request #9449 from ethereum/fixEnforceViaYul

Fix enforce via yul

test/libsolidity/SemanticTest.cpp

@@ -46,7 +46,7 @@ SemanticTest::SemanticTest(string const& _filename, langutil::EVMVersion _evmVer
 	m_lineOffset(m_reader.lineNumber()),
 	m_enforceViaYul(enforceViaYul)
 {
-	string choice = m_reader.stringSetting("compileViaYul", "false");
+	string choice = m_reader.stringSetting("compileViaYul", "default");
 	if (choice == "also")
 	{
 		m_runWithYul = true;
@@ -64,6 +64,11 @@ SemanticTest::SemanticTest(string const& _filename, langutil::EVMVersion _evmVer
 		// Do not try to run via yul if explicitly denied.
 		m_enforceViaYul = false;
 	}
+	else if (choice == "default")
+	{
+		m_runWithYul = false;
+		m_runWithoutYul = true;
+	}
 	else
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid compileViaYul value: " + choice + "."));
 

test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol

@@ -18,5 +18,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb

test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol

@@ -12,5 +12,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0xe0, 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc -> 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc

test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol

@@ -45,6 +45,8 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f0() -> 0x20, 0x0
 // f1() -> 0x20, 0x40, 0x1, 0x2

test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol

@@ -19,5 +19,7 @@ contract C {
         return (b.b, this.g(b));
     }
 }
+// ====
+// compileViaYul: also
 // ----
 // f() -> 11, 11

test/libsolidity/semanticTests/array/calldata_array_of_struct.sol

@@ -20,5 +20,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4

test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol

@@ -33,6 +33,8 @@ contract c {
         l2 = ids.length;
     }
 }
+// ====
+// compileViaYul: also
 // ----
 // setIDStatic(uint256): 0xb ->
 // getID(uint256): 0x2 -> 0xb

test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol

@@ -7,6 +7,7 @@ contract CalldataTest {
     }
 }
 // ====
+// compileViaYul: also
 // EVMVersion: >=byzantium
 // ----
 // tester(bytes): 0x20, 0x08, "abcdefgh" -> "c"

test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol

@@ -16,6 +16,8 @@ contract C {
         }
     }
 }
+// ====
+// compileViaYul: also
 // ----
 // f((uint8,bytes1)): 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" -> 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" # double check that the valid case goes through #
 // f((uint8,bytes1)): 0x1234, hex"5678000000000000000000000000000000000000000000000000000000000000" -> FAILURE

test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol

@@ -13,5 +13,7 @@ contract C {
         return f(s);
     }
 }
+// ====
+// compileViaYul: also
 // ----
 // f(uint256,(uint256,uint256),uint256): 7, 1, 2, 4 -> 1, 2

test/libsolidity/semanticTests/dirty_calldata_bytes.sol

@@ -8,5 +8,7 @@ contract C {
         correct = r == (0x64 << 248);
     }
 }
+// ====
+// compileViaYul: also
 // ----
-// f(bytes): 0x20, 0x04, "dead" -> true
+// f(bytes): 0x20, 0x04, "dead" -> true

test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol

@@ -8,5 +8,7 @@ contract C {
         correct = r == 0x7fff;
     }
 }
+// ====
+// compileViaYul: also
 // ----
-// f(int16[]): 0x20, 0x02, 0x7fff, 0x7fff -> true
+// f(int16[]): 0x20, 0x02, 0x7fff, 0x7fff -> true

test/libsolidity/semanticTests/functionCall/call_options_overload.sol

@@ -9,6 +9,8 @@ contract C {
     }
     receive() external payable {}
 }
+// ====
+// compileViaYul: also
 // ----
 // (), 1 ether
 // call() -> 1, 2, 2, 2

test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol

@@ -22,5 +22,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f() -> 2

test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol

@@ -22,5 +22,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f() -> 2

test/libsolidity/semanticTests/multiSource/import.sol

@@ -7,6 +7,8 @@ import "A";
 contract B is A {
 	function f(uint256 x) public view returns(uint256) { return x; }
 }
+// ====
+// compileViaYul: also
 // ----
 // f(uint256): 1337 -> 1337
 // g(uint256): 1337 -> 1338

test/libsolidity/semanticTests/smoke/structs.sol

@@ -17,6 +17,8 @@ contract C {
         return T(23, 42, "any");
     }
 }
+// ====
+// compileViaYul: also
 // ----
 // s() -> 23, 42
 // t() -> 0x20, 23, 42, 0x60, 3, "any"

test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol

@@ -41,5 +41,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // test() -> true

test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol

@@ -29,5 +29,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // test() -> 1

test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol

@@ -26,5 +26,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // test() -> 1

test/libsolidity/semanticTests/strings/unicode_escapes.sol

@@ -15,6 +15,8 @@ contract C {
         return "\u0024\u00A2\u20AC";
     }
 }
+// ====
+// compileViaYul: also
 // ----
 // oneByteUTF8() -> 0x20, 7, "aaa$aaa"
 // twoBytesUTF8() -> 0x20, 8, "aaa\xc2\xa2aaa"

test/libsolidity/semanticTests/strings/unicode_string.sol

@@ -3,5 +3,7 @@ contract C {
         return "😃, 😭, and 😈";
     }
 }
+// ====
+// compileViaYul: also
 // ----
 // f() -> 0x20, 0x14, "\xf0\x9f\x98\x83, \xf0\x9f\x98\xad, and \xf0\x9f\x98\x88"

test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol

@@ -13,5 +13,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f((uint256,uint256)): 42, 23 -> 42, 23

test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol

@@ -16,5 +16,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f(uint256,(uint256,uint256),uint256): 1, 2, 3, 4 -> 1, 2, 3, 4

test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol

@@ -23,5 +23,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f((uint256,uint256),(uint256),(uint256,uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5

test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol

@@ -7,5 +7,7 @@ contract C {
 		return (s.children.length, s.a, s.children[0].b, s.children[1].b);
 	}
 }
+// ====
+// compileViaYul: also
 // ----
 // f((uint256,(uint256)[])): 32, 17, 64, 2, 23, 42 -> 2, 17, 23, 42

test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol

@@ -6,5 +6,7 @@ contract C {
 	    return (s.a.length, s.a[0], s.a[1]);
 	}
 }
+// ====
+// compileViaYul: also
 // ----
 // f((uint256[])): 32, 32, 2, 42, 23 -> 2, 42, 23

test/libsolidity/semanticTests/various/cross_contract_types.sol

@@ -13,5 +13,7 @@ contract Test {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f() -> 3

test/libsolidity/semanticTests/various/memory_overwrite.sol

@@ -6,5 +6,7 @@ contract C {
     }
 }
 
+// ====
+// compileViaYul: also
 // ----
 // f() -> 0x20, 5, "b23a5"

test/libsolidity/semanticTests/various/negative_stack_height.sol

@@ -58,6 +58,7 @@ contract C {
         )
     {}
 }
-
+// ====
+// compileViaYul: false
 // ----
 // constructor() ->