Merge pull request #15639 from ethereum/yul_evm_current_version

Add Yul EVM version "current"

test/TestCase.cpp

@@ -114,7 +114,11 @@ void EVMVersionRestrictedTestCase::processEVMVersionSetting()
 			break;
 
 	versionString = versionString.substr(versionBegin);
-	std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(versionString);
+	std::optional<langutil::EVMVersion> version;
+	if (versionString == "current")
+		version = std::make_optional<langutil::EVMVersion>();
+	else
+		version = langutil::EVMVersion::fromString(versionString);
 	if (!version)
 		BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid EVM version: \"" + versionString + "\""});
 

test/libyul/EVMCodeTransformTest.cpp

@@ -46,7 +46,6 @@ EVMCodeTransformTest::EVMCodeTransformTest(std::string const& _filename):
 	m_source = m_reader.source();
 	m_stackOpt = m_reader.boolSetting("stackOptimization", false);
 	m_expectation = m_reader.simpleExpectations();
-	m_shouldRun = CommonOptions::get().evmDialect().evmVersion() == EVMVersion{};
 }
 
 TestCase::TestResult EVMCodeTransformTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
@@ -57,8 +56,8 @@ TestCase::TestResult EVMCodeTransformTest::run(std::ostream& _stream, std::strin
 	// Restrict to a single EVM/EOF version combination (the default one) as code generation
 	// can be different from version to version.
 	YulStack stack(
-		EVMVersion{},
-		std::nullopt,
+		CommonOptions::get().evmVersion(),
+		CommonOptions::get().eofVersion(),
 		YulStack::Language::StrictAssembly,
 		settings,
 		DebugInfoSelection::All()

test/libyul/evmCodeTransform/after_terminating_function.yul

@@ -5,6 +5,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":17:18   */
 //   0x02

test/libyul/evmCodeTransform/early_push_on_deep_swap.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":1027:1092   */
 //   0x0100000000000000000000000000000000000000000000000000000000000001

test/libyul/evmCodeTransform/literal_loop.yul

@@ -14,6 +14,7 @@ object "main" {
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":62:82   */
 //   dataSize(sub_0)

test/libyul/evmCodeTransform/nonempty_initial_layout.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":9:69   */
 //   0x2000000000000000000000000000000000000000000000000000000000

test/libyul/evmCodeTransform/pops_in_reverting_branch.yul

@@ -10,6 +10,7 @@ object "main" {
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":51:52   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/for_1.yul

@@ -1,6 +1,7 @@
 { for { let z := 0 } 1 { } { let x := 3 } let t := 2 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":17:18   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/for_2.yul

@@ -1,6 +1,7 @@
 { for { let z := 0 } 1 { } { z := 8 let x := 3 } let t := 2 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":17:18   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:88   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_call.yul

@@ -5,6 +5,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":15:22   */
 //   tag_2

test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul

@@ -24,6 +24,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:662   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_params.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:28   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul

@@ -7,6 +7,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":210:252   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:80   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:32   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:65   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:65   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:78   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:70   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:67   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:74   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:46   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:52   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_trivial.yul

@@ -3,6 +3,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:22   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul

@@ -8,6 +8,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":15:16   */
 //   0x03

test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul

@@ -9,6 +9,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":74:81   */
 //   tag_3

test/libyul/evmCodeTransform/stackReuse/if.yul

@@ -2,6 +2,7 @@
 { let z := mload(0) if z { let x := z } let t := 3 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":72:73   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul

@@ -1,6 +1,7 @@
 { let z := 0 { pop(z) } let x := 1 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":11:12   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul

@@ -1,6 +1,7 @@
 { let z := mload(0) { let x := 1 x := 6 z := x } { let x := 2 z := x x := 4 } }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":17:18   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul

@@ -1,6 +1,7 @@
 { let x := 1 x := 6 let y := 2 y := 4 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":11:12   */
 //   0x01

test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul

@@ -1,6 +1,7 @@
 { let x := 1 x := 6 { let y := 2 y := 4 } }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":11:12   */
 //   0x01

test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul

@@ -7,6 +7,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":15:16   */
 //   0x05

test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul

@@ -5,6 +5,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":15:16   */
 //   0x05

test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul

@@ -5,6 +5,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":37:38   */
 //   0x02

test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul

@@ -5,6 +5,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":15:16   */
 //   0x05

test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul

@@ -1,6 +1,7 @@
 { let a, b, c, d let x := 2 let y := 3 mstore(x, a) mstore(y, c) }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":2:16   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul

@@ -4,6 +4,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":58:61   */
 //   tag_2

test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul

@@ -8,6 +8,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":106:107   */
 //   0x05

test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul

@@ -32,6 +32,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":15:16   */
 //   0x07

test/libyul/evmCodeTransform/stackReuse/single_var.yul

@@ -1,6 +1,7 @@
 { let x }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":2:7   */
 //   0x00

test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul

@@ -1,6 +1,7 @@
 { let x := 1 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":11:12   */
 //   0x01

test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul

@@ -1,6 +1,7 @@
 { let x := 1 mstore(3, 4) }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":11:12   */
 //   0x01

test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul

@@ -1,6 +1,7 @@
 { let x := 1 mstore(3, 4) pop(mload(x)) }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":11:12   */
 //   0x01

test/libyul/evmCodeTransform/stackReuse/smoke.yul

@@ -1,6 +1,7 @@
 {}
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:2   */
 //   stop

test/libyul/evmCodeTransform/stackReuse/switch.yul

@@ -1,6 +1,7 @@
 { let z := 0 switch z case 0 { let x := 2 let y := 3 } default { z := 3 } let t := 9 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":11:12   */
 //   0x00

test/libyul/evmCodeTransform/stub.yul

@@ -19,6 +19,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":14:21   */
 //   tag_2

test/libyul/evmCodeTransform/unassigned_return_variable.yul

@@ -6,6 +6,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: =current
 // ----
 //     /* "":0:111   */
 //   stop