Pass evmVersion and eofVersion to YulStack in ObjectCompilerTest

test/libyul/ObjectCompilerTest.cpp

@@ -46,7 +46,7 @@ using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 
 ObjectCompilerTest::ObjectCompilerTest(std::string const& _filename):
-	TestCase(_filename)
+	solidity::frontend::test::EVMVersionRestrictedTestCase(_filename)
 {
 	m_source = m_reader.source();
 	m_optimisationPreset = m_reader.enumSetting<OptimisationPreset>(
@@ -65,8 +65,8 @@ ObjectCompilerTest::ObjectCompilerTest(std::string const& _filename):
 TestCase::TestResult ObjectCompilerTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	YulStack stack(
-		EVMVersion(),
-		std::nullopt,
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		YulStack::Language::StrictAssembly,
 		OptimiserSettings::preset(m_optimisationPreset),
 		DebugInfoSelection::All()

test/libyul/ObjectCompilerTest.h

@@ -38,7 +38,7 @@ struct Block;
 namespace solidity::yul::test
 {
 
-class ObjectCompilerTest: public solidity::frontend::test::TestCase
+class ObjectCompilerTest: public solidity::frontend::test::EVMVersionRestrictedTestCase
 {
 public:
 	static std::unique_ptr<TestCase> create(Config const& _config)

test/libyul/objectCompiler/datacopy.yul

@@ -11,6 +11,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":77:92   */

test/libyul/objectCompiler/dataoffset_code.yul

@@ -5,6 +5,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:61   */

test/libyul/objectCompiler/dataoffset_data.yul

@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, dataoffset("data1")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":56:75   */

test/libyul/objectCompiler/dataoffset_self.yul

@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, dataoffset("a")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:59   */

test/libyul/objectCompiler/datasize_code.yul

@@ -5,6 +5,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:59   */

test/libyul/objectCompiler/datasize_data.yul

@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, datasize("data1")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":44:61   */

test/libyul/objectCompiler/datasize_self.yul

@@ -2,6 +2,8 @@ object "a" {
   code { sstore(0, datasize("a")) }
   data "data1" "Hello, World!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":36:49   */

test/libyul/objectCompiler/function_series.yul

@@ -11,6 +11,7 @@ object "Contract" {
 }
 
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: none
 // ----
 // Assembly:

test/libyul/objectCompiler/identical_subobjects_full_debug_info.yul

@@ -64,6 +64,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/identical_subobjects_no_debug_info.yul

@@ -50,6 +50,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/identical_subobjects_partial_debug_info.yul

@@ -69,6 +69,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/identical_subobjects_partial_debug_info_no_use_src.yul

@@ -56,6 +56,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/identical_subobjects_with_subject_references.yul

@@ -95,6 +95,7 @@ object "A" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul

@@ -7,6 +7,8 @@ object "a" {
         )
     }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":143:185   */

test/libyul/objectCompiler/leading_and_trailing_dots.yul

@@ -12,6 +12,8 @@
     }
     g(2)
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":53:54   */

test/libyul/objectCompiler/linkersymbol.yul

@@ -5,6 +5,8 @@ object "a" {
         let success := call(gas(), addr, 0, 128, 4, 128, 0)
     }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":190:191   */

test/libyul/objectCompiler/long_object_name.yul

@@ -7,6 +7,7 @@ object "t" {
 	}
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/manySubObjects.yul

@@ -134,6 +134,8 @@ object "root" {
         }
     }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":59:75   */

test/libyul/objectCompiler/metadata.yul

@@ -19,6 +19,8 @@ object "A" {
   data ".metadata" "M2"
   data "x" "Hello, World2!"
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":55:68   */

test/libyul/objectCompiler/namedObjectCode.yul

@@ -1,6 +1,8 @@
 object "a" {
   code { sstore(0, 1) }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":36:37   */

test/libyul/objectCompiler/nested_optimizer.yul

@@ -15,6 +15,7 @@ object "a" {
   }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/simple.yul

@@ -1,6 +1,8 @@
 {
   sstore(0, 1)
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":41:42   */

test/libyul/objectCompiler/simple_optimizer.yul

@@ -5,6 +5,7 @@
   sstore(add(x, 0), z)
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly:

test/libyul/objectCompiler/sourceLocations.yul

@@ -28,6 +28,8 @@ object "a" {
     data "data1" "Hello, World!"
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "abc.sol":0:2   */

test/libyul/objectCompiler/subObjectAccess.yul

@@ -65,6 +65,8 @@ object "A" {
     }
   }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // Assembly:
 //     /* "source":57:72   */

test/libyul/objectCompiler/verbatim_bug.yul

@@ -23,6 +23,7 @@ object "a" {
     }
 }
 // ====
+// EVMVersion: >=shanghai
 // optimizationPreset: full
 // ----
 // Assembly: