argotorg · rodiazet · May 9, 2026
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
@@ -144,19 +144,8 @@ void EVMVersionRestrictedTestCase::processEVMVersionSetting()
 		m_shouldRun = false;
 }
 
-void EVMVersionRestrictedTestCase::processBytecodeFormatSetting()
-{
-	std::string bytecodeFormatString = m_reader.stringSetting("bytecodeFormat", "legacy");
-	if (bytecodeFormatString == "legacy")
-		return;
-
-	if (bytecodeFormatString != "legacy")
-		BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid bytecodeFormat flag: \"" + bytecodeFormatString + "\""});
-}
-
 EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(std::string const& _filename):
 	TestCase(_filename)
 {
 	processEVMVersionSetting();
-	processBytecodeFormatSetting();
 }
diff --git a/test/TestCase.h b/test/TestCase.h
@@ -113,7 +113,6 @@ class EVMVersionRestrictedTestCase: public TestCase
 {
 private:
 	void processEVMVersionSetting();
-	void processBytecodeFormatSetting();
 
 protected:
 	EVMVersionRestrictedTestCase(std::string const& _filename);

diff --git a/test/libevmasm/EVMAssemblyTest.h b/test/libevmasm/EVMAssemblyTest.h
@@ -38,7 +38,6 @@ namespace solidity::evmasm::test
 ///
 /// Available settings:
 /// - EVMVersion: The range of EVM versions to run the test for. Inherited from EVMVersionRestrictedTestCase.
-/// - bytecodeFormat: Bytecode format setting (only "legacy" is currently supported). Inherited from EVMVersionRestrictedTestCase.
 /// - outputs: List of outputs to include in the test. The order of values does NOT determine the order
 ///     in which the outputs are printed. Supported outputs: InputAssemblyJSON, Assembly, Bytecode, Opcodes, SourceMappings.
 ///     The default is to print all outputs except InputAssemblyJSON.

diff --git a/test/libevmasm/evmAssemblyTests/isoltestTesting/settings_eof_version.asmjson b/test/libevmasm/evmAssemblyTests/isoltestTesting/settings_eof_version.asmjson
diff --git a/test/libsolidity/gasTests/abiv2.sol b/test/libsolidity/gasTests/abiv2.sol
@@ -14,7 +14,6 @@ contract C {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // ----
 // creation:
 //   codeDepositCost: 1208000

diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
@@ -14,7 +14,6 @@ contract C {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // optimize: true
 // optimize-yul: true
 // ----

diff --git a/test/libsolidity/gasTests/data_storage.sol b/test/libsolidity/gasTests/data_storage.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // ----
 // creation:
 //   codeDepositCost: 377800

diff --git a/test/libsolidity/gasTests/dispatch_large.sol b/test/libsolidity/gasTests/dispatch_large.sol
@@ -24,7 +24,6 @@ contract Large {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // ----
 // creation:
 //   codeDepositCost: 618400

diff --git a/test/libsolidity/gasTests/dispatch_large_optimised.sol b/test/libsolidity/gasTests/dispatch_large_optimised.sol
@@ -24,7 +24,6 @@ contract Large {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // optimize: true
 // optimize-runs: 2
 // ----

diff --git a/test/libsolidity/gasTests/dispatch_medium.sol b/test/libsolidity/gasTests/dispatch_medium.sol
@@ -11,7 +11,6 @@ contract Medium {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // ----
 // creation:
 //   codeDepositCost: 259600

diff --git a/test/libsolidity/gasTests/dispatch_medium_optimised.sol b/test/libsolidity/gasTests/dispatch_medium_optimised.sol
@@ -11,7 +11,6 @@ contract Medium {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // ====
 // optimize: true
 // optimize-runs: 2

diff --git a/test/libsolidity/gasTests/dispatch_small.sol b/test/libsolidity/gasTests/dispatch_small.sol
@@ -6,7 +6,6 @@ contract Small {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // ----
 // creation:
 //   codeDepositCost: 103800

diff --git a/test/libsolidity/gasTests/dispatch_small_optimised.sol b/test/libsolidity/gasTests/dispatch_small_optimised.sol
@@ -8,7 +8,6 @@ contract Small {
 // EVMVersion: =current
 // optimize: true
 // optimize-runs: 2
-// bytecodeFormat: legacy
 // ----
 // creation:
 //   codeDepositCost: 58200

diff --git a/test/libsolidity/gasTests/exp.sol b/test/libsolidity/gasTests/exp.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // optimize: false
 // optimize-yul: false
 // ----

diff --git a/test/libsolidity/gasTests/exp_optimized.sol b/test/libsolidity/gasTests/exp_optimized.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: =current
-// bytecodeFormat: legacy
 // optimize: true
 // optimize-yul: true
 // ----

diff --git a/test/libsolidity/gasTests/storage_costs.sol b/test/libsolidity/gasTests/storage_costs.sol
@@ -14,7 +14,6 @@ contract C {
 // EVMVersion: =current
 // optimize: true
 // optimize-yul: true
-// bytecodeFormat: legacy
 // ----
 // creation:
 //   codeDepositCost: 25600

diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -23,7 +23,6 @@ contract Creator {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
 // gas irOptimized: 327784

diff --git a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
@@ -20,6 +20,5 @@ contract Derived is Base {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // getA() -> 49
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -23,7 +23,6 @@ contract Creator {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
 // gas irOptimized: 169297

diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -7,7 +7,6 @@ contract Test {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
 // gas irOptimized: 181629

diff --git a/test/libsolidity/semanticTests/constructor/callvalue_check.sol b/test/libsolidity/semanticTests/constructor/callvalue_check.sol
@@ -29,7 +29,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// bytecodeFormat: legacy
 // ----
 // f(uint256), 2000 ether: 0 -> true
 // f(uint256), 2000 ether: 100 -> false

diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -16,7 +16,6 @@ contract Main {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // constructor(): "abc", true
 // gas irOptimized: 80174

diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
@@ -33,7 +33,6 @@ contract Main {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // getFlag() -> true
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
@@ -4,6 +4,5 @@ contract D {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // constructor(): 0xfdd67305928fcac8d213d1e47bfa6165cd0b87b946644cd0000000000000000 ->
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // f() -> 16
 // gas legacy: 78477

diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 148129

diff --git a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
@@ -14,7 +14,6 @@ contract B {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // testIt() ->
 // test() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
@@ -20,6 +20,5 @@ contract Derived is Base {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // getA() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
@@ -15,6 +15,5 @@ contract Test {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // getName() -> "abc"
diff --git a/...ibsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol b/...ibsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
@@ -25,6 +25,5 @@ contract Test {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // getName() -> "def\x00\x00\x00"
diff --git a/...solidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol b/...solidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
@@ -15,7 +15,6 @@ contract Derived is Base {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // getBMember() -> 5
 // getDMember() -> 6
diff --git a/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol b/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
@@ -19,6 +19,5 @@ contract X is D, C, B, A {
     constructor() A(f(1)) C(f(2)) B(f(3)) D(f(4)) {}
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // g() -> 0x20, 4, 1, 3, 2, 4
diff --git a/test/libsolidity/semanticTests/constructor/payable_constructor.sol b/test/libsolidity/semanticTests/constructor/payable_constructor.sol
@@ -2,6 +2,5 @@ contract C {
     constructor() payable {}
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // constructor(), 27 wei ->
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // use(uint256): 3 -> 6
 // result_in_constructor() -> 4
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // use(uint16): 3 -> 0xfff9
 // result_in_constructor() -> 0xfffb

diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // t() -> 7
diff --git a/...idity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol b/...idity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol b/test/libsolidity/semanticTests/constructor/transient_state_variable_initialization.sol
@@ -14,6 +14,5 @@ contract C {
 
 // ====
 // EVMVersion: >=cancun
-// bytecodeFormat: legacy
 // ----
 // f() -> 100
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol
@@ -37,6 +37,5 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol
@@ -31,6 +31,5 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol
@@ -33,6 +33,5 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol
@@ -32,6 +32,5 @@ contract C is S {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
@@ -38,6 +38,5 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol
@@ -32,6 +32,5 @@ contract C is S {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol
@@ -36,6 +36,5 @@ contract C is X {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/ecrecover/ecrecover.sol b/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
@@ -4,7 +4,6 @@ contract test {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // a(bytes32,uint8,bytes32,bytes32):
 // 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,

diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // constructor() ->
 // gas irOptimized: 113970

diff --git a/test/libsolidity/semanticTests/experimental/stub.sol b/test/libsolidity/semanticTests/experimental/stub.sol
@@ -93,7 +93,6 @@ contract C {
 // EVMVersion: >=constantinople
 // ====
 // compileViaYul: true
-// bytecodeFormat: legacy
 // ----
 // (): 0 -> 0
 // (): 1 -> 544
diff --git a/test/libsolidity/semanticTests/experimental/type_class.sol b/test/libsolidity/semanticTests/experimental/type_class.sol
@@ -64,6 +64,5 @@ contract C {
 // experimental: true
 // EVMVersion: >=constantinople
 // compileViaYul: true
-// bytecodeFormat: legacy
 // ----
 // () -> 1, 0
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
@@ -12,6 +12,5 @@ contract D {
   }
 }
 // ====
-// bytecodeFormat: legacy
 // ----
 // f() -> true
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ contract Creator { @@
         }
     }
     // ====
-    // bytecodeFormat: legacy
     // ----
     // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
     // gas irOptimized: 327784
@@ Expand Down @@