argotorg · nikola-matic · Oct 6, 2025 · Oct 20, 2025
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
@@ -83,6 +83,12 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 	else if (_pragma.literals()[0] == "experimental")
 	{
 		solAssert(m_sourceUnit, "");
+		if (!m_experimental)
+			m_errorReporter.syntaxError(
+				2816_error,
+				_pragma.location(),
+				"Experimental pragmas can only be used if the experimental mode has been enabled."
+			);
 		std::vector<std::string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
 		if (literals.empty())
 			m_errorReporter.syntaxError(

diff --git a/libsolidity/analysis/SyntaxChecker.h b/libsolidity/analysis/SyntaxChecker.h
@@ -45,9 +45,12 @@ class SyntaxChecker: private ASTConstVisitor
 {
 public:
 	/// @param _errorReporter provides the error logging functionality.
-	SyntaxChecker(langutil::ErrorReporter& _errorReporter, bool _useYulOptimizer):
+	/// @param _useYulOptimizer indicates whether Yul optimizer is enabled.
+	/// @param _experimental indicates whether the experimental toggle (option) is enabled.
+	SyntaxChecker(langutil::ErrorReporter& _errorReporter, bool _useYulOptimizer, bool _experimental):
 		m_errorReporter(_errorReporter),
-		m_useYulOptimizer(_useYulOptimizer)
+		m_useYulOptimizer(_useYulOptimizer),
+		m_experimental(_experimental)
 	{}
 
 	bool checkSyntax(ASTNode const& _astRoot);
@@ -112,6 +115,9 @@ class SyntaxChecker: private ASTConstVisitor
 	/// Flag that indicates whether we are inside an unchecked block.
 	bool m_uncheckedArithmetic = false;
 
+	/// Flag that indicates whether experimental mode is toggled.
+	bool m_experimental = false;
+
 	int m_inLoopDepth = 0;
 	std::optional<ContractKind> m_currentContractKind;
 

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
@@ -229,6 +229,12 @@ void CompilerStack::setViaIR(bool _viaIR)
 	m_viaIR = _viaIR;
 }
 
+void CompilerStack::setExperimental(bool _experimental)
+{
+	solAssert(m_stackState < ParsedAndImported, "Must set experimental before parsing.");
+	m_experimental = _experimental;
+}
+
 void CompilerStack::setEVMVersion(langutil::EVMVersion _version)
 {
 	solAssert(m_stackState < ParsedAndImported, "Must set EVM version before parsing.");
@@ -467,7 +473,7 @@ bool CompilerStack::analyze()
 	{
 		bool experimentalSolidity = isExperimentalSolidity();
 
-		SyntaxChecker syntaxChecker(m_errorReporter, m_optimiserSettings.runYulOptimiser);
+		SyntaxChecker syntaxChecker(m_errorReporter, m_optimiserSettings.runYulOptimiser, m_experimental);
 		for (Source const* source: m_sourceOrder)
 			if (source->ast && !syntaxChecker.checkSyntax(*source->ast))
 				noErrors = false;

diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
@@ -223,6 +223,9 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// Must be set before parsing.
 	void setViaIR(bool _viaIR);
 
+	/// Sets the experimental toggle to allow usage of experimental features.
+	void setExperimental(bool _experimental);
+
 	/// Set the EVM version used before running compile.
 	/// When called without an argument it will revert to the default version.
 	/// Must be set before parsing.
@@ -607,6 +610,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	RevertStrings m_revertStrings = RevertStrings::Default;
 	State m_stopAfter = State::CompilationSuccessful;
 	bool m_viaIR = false;
+	bool m_experimental = false;
 	langutil::EVMVersion m_evmVersion;
 	std::optional<uint8_t> m_eofVersion;
 	ModelCheckerSettings m_modelCheckerSettings;

diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
@@ -117,7 +117,7 @@ function test_ast_import_export_equivalence
     local input_files=( "${@:2}" )
 
     local export_command=("$SOLC" --combined-json ast --pretty-json --json-indent 4 "${input_files[@]}")
-    local import_command=("$SOLC" --import-ast --combined-json ast --pretty-json --json-indent 4 expected.json)
+    local import_command=("$SOLC" --experimental --import-ast --combined-json ast --pretty-json --json-indent 4 expected.json)
     local import_via_standard_json_command=("$SOLC" --combined-json ast --pretty-json --json-indent 4 --standard-json standard_json_input.json)
 
     # export ast - save ast json as expected result (silently)
@@ -228,7 +228,7 @@ function test_evmjson_import_export_equivalence
         local bin_file_from_asm_import
         bin_file_from_asm_import="import/$(basename "${asm_json_file}" .json).bin"
 
-        local import_options=(--bin --import-asm-json "${asm_json_file}")
+        local import_options=(--experimental --bin --import-asm-json "${asm_json_file}")
         run_solc_store_stdout "${bin_file_from_asm_import}" "${import_options[@]}"
 
         stripCLIDecorations < "$bin_file_from_asm_import" > tmpfile

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
@@ -927,6 +927,7 @@ void CommandLineInterface::compile()
 
 	try
 	{
+		m_compiler->setExperimental(m_options.experimental);
 		if (m_options.metadata.literalSources)
 			m_compiler->useMetadataLiteralSources(true);
 		m_compiler->setMetadataFormat(m_options.metadata.format);

diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
@@ -50,6 +50,7 @@ static std::string const g_strEVMVersion = "evm-version";
 static std::string const g_strEOFVersion = "experimental-eof-version";
 static std::string const g_strViaIR = "via-ir";
 static std::string const g_strExperimentalViaIR = "experimental-via-ir";
+static std::string const g_strExperimental = "experimental";
 static std::string const g_strGas = "gas";
 static std::string const g_strHelp = "help";
 static std::string const g_strImportAst = "import-ast";
@@ -157,6 +158,18 @@ void CommandLineParser::checkMutuallyExclusive(std::vector<std::string> const& _
 	}
 }
 
+void CommandLineParser::checkExperimental(std::vector<std::string> const& _optionNames)
+{
+	if (!m_args.contains(g_strExperimental) && countEnabledOptions(_optionNames) > 0)
+	{
+		solThrow(
+			CommandLineValidationError,
+			"The following options are only available in experimental mode: " + joinOptionNames(_optionNames) + ". " +
+			"To toggle experimental mode, use the --experimental flag."
+		);
+	}
+}
+
 bool CompilerOutputs::operator==(CompilerOutputs const& _other) const noexcept
 {
 	for (bool CompilerOutputs::* member: componentMap() | ranges::views::values)
@@ -936,6 +949,17 @@ General Information)").c_str(),
 	;
 	desc.add(smtCheckerOptions);
 
+	po::options_description experimentalOptions("Experimental options");
+	experimentalOptions.add_options()
+		(
+			g_strExperimental.c_str(),
+			"Toggle experimental mode. Note that toggling experimental mode by itself will not "
+			"enable any experimental features, but will simply allow for such features to be enabled in the "
+			"usual manner, whether by using specific flags or pragmas."
+		)
+	;
+	desc.add(experimentalOptions);
+
 	desc.add_options()(g_strInputFile.c_str(), po::value<std::vector<std::string>>(), "input file");
 	return desc;
 }
@@ -979,6 +1003,9 @@ void CommandLineParser::processArgs()
 	else if (m_args.count(g_strColor) > 0)
 		m_options.formatting.coloredOutput = true;
 
+	if (m_args.contains(g_strExperimental))
+		m_options.experimental = true;
+
 	checkMutuallyExclusive({
 		g_strHelp,
 		g_strLicense,
@@ -992,6 +1019,18 @@ void CommandLineParser::processArgs()
 		g_strImportEvmAssemblerJson,
 	});
 
+	checkExperimental({
+		g_strLSP,
+		g_strImportAst,
+		g_strImportEvmAssemblerJson,
+		"ir-ast-json",
+		"ir-optimized-ast-json",
+		"yul-cfg-json",
+		"ethdebug",
+		"ethdebug-runtime",
+		g_strEOFVersion,
+	});
+
 	if (m_args.count(g_strHelp) > 0)
 		m_options.input.mode = InputMode::Help;
 	else if (m_args.count(g_strLicense) > 0)
@@ -1020,6 +1059,14 @@ void CommandLineParser::processArgs()
 	)
 		return;
 
+	if (m_options.experimental && m_options.input.mode == InputMode::StandardJson)
+		solThrow(
+			CommandLineValidationError,
+			"Standard JSON input mode is incompatible with the --" + g_strExperimental + " flag. "
+			"Please use the appropriate experimental option in your Standard JSON input file to "
+			"enable experimental mode."
+		);
+
 	if (m_args.count(g_strYul) > 0)
 		solThrow(
 			CommandLineValidationError,
@@ -1092,6 +1139,7 @@ void CommandLineParser::processArgs()
 			g_strPrettyJson,
 			"srcmap",
 			"srcmap-runtime",
+			g_strExperimental,
 		};
 
 		for (auto const& [optionName, optionValue]: m_args)
@@ -1159,6 +1207,12 @@ void CommandLineParser::processArgs()
 		if (!m_options.output.debugInfoSelection.has_value())
 			solThrow(CommandLineValidationError, "Invalid value for --" + g_strDebugInfo + " option: " + optionValue);
 
+		if (!m_options.experimental && m_options.output.debugInfoSelection->ethdebug)
+			solThrow(
+				CommandLineValidationError,
+				"--" + g_strDebugInfo + " ethdebug can only be used by toggling the --" + g_strExperimental + " flag."
+			);
+
 		if (m_options.output.debugInfoSelection->snippet && !m_options.output.debugInfoSelection->location)
 			solThrow(CommandLineValidationError, "To use 'snippet' with --" + g_strDebugInfo + " you must select also 'location'.");
 	}

diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
@@ -245,6 +245,8 @@ struct CommandLineOptions
 		bool initialize = false;
 		ModelCheckerSettings settings;
 	} modelChecker;
+
+	bool experimental = false;
 };
 
 /// Parses the command-line arguments and produces a filled-out CommandLineOptions structure.
@@ -296,6 +298,7 @@ class CommandLineParser
 	void parseOutputSelection();
 
 	void checkMutuallyExclusive(std::vector<std::string> const& _optionNames);
+	void checkExperimental(std::vector<std::string> const& _optionNames);
 	size_t countEnabledOptions(std::vector<std::string> const& _optionNames) const;
 	static std::string joinOptionNames(std::vector<std::string> const& _optionNames, std::string _separator = ", ");
 

diff --git a/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/args b/test/cmdlineTests/asm_json_import_sourcelist_with_null_elements/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --import-asm-json -
+--pretty-json --json-indent 4 --experimental --import-asm-json -
diff --git a/test/cmdlineTests/asm_json_yul_export_evm_asm_import/args b/test/cmdlineTests/asm_json_yul_export_evm_asm_import/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm --bin --asm-json --pretty-json --json-indent 4
+--experimental --import-asm-json - --opcodes --asm --bin --asm-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/ast_ir/args b/test/cmdlineTests/ast_ir/args
@@ -1 +1 @@
---ir-ast-json --ir-optimized-ast-json --optimize --pretty-json --json-indent 4
+--experimental --ir-ast-json --ir-optimized-ast-json --optimize --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/ast_json_import_wrong_evmVersion/args b/test/cmdlineTests/ast_json_import_wrong_evmVersion/args
@@ -1 +1 @@
---evm-version=homestead --import-ast --combined-json ast --pretty-json
+--experimental --evm-version=homestead --import-ast --combined-json ast --pretty-json
diff --git a/test/cmdlineTests/eof_unavailable_before_osaka/args b/test/cmdlineTests/eof_unavailable_before_osaka/args
@@ -1 +1 @@
---optimize --experimental-eof-version 1 --evm-version cancun
+--experimental --optimize --experimental-eof-version 1 --evm-version cancun
diff --git a/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/args b/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/args
@@ -0,0 +1 @@
+--debug-info ethdebug
diff --git a/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/err b/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/err
@@ -0,0 +1 @@
+Error: --debug-info ethdebug can only be used by toggling the --experimental flag.
diff --git a/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/exit b/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/input.sol b/test/cmdlineTests/ethdebug_debuginfo_without_experimental_flag/input.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public {}
+}
diff --git a/test/cmdlineTests/ethdebug_eof_container_osaka/args b/test/cmdlineTests/ethdebug_eof_container_osaka/args
@@ -1 +1 @@
- --experimental-eof-version 1 --evm-version osaka --ethdebug --via-ir --pretty-json --json-indent 4
+--experimental --experimental-eof-version 1 --evm-version osaka --ethdebug --via-ir --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/ethdebug_on_abstract/args b/test/cmdlineTests/ethdebug_on_abstract/args
@@ -1 +1 @@
---ethdebug --via-ir --pretty-json --json-indent 4
+--experimental --ethdebug --via-ir --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/ethdebug_on_interface/args b/test/cmdlineTests/ethdebug_on_interface/args
@@ -1 +1 @@
---ethdebug --via-ir --pretty-json --json-indent 4
+--experimental --ethdebug --via-ir --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/experimental_feature_without_experimental_flag/args b/test/cmdlineTests/experimental_feature_without_experimental_flag/args
@@ -0,0 +1 @@
+--ir-ast-json
diff --git a/test/cmdlineTests/experimental_feature_without_experimental_flag/err b/test/cmdlineTests/experimental_feature_without_experimental_flag/err
@@ -0,0 +1 @@
+Error: The following options are only available in experimental mode: --lsp, --import-ast, --import-asm-json, --ir-ast-json, --ir-optimized-ast-json, --yul-cfg-json, --ethdebug, --ethdebug-runtime, --experimental-eof-version. To toggle experimental mode, use the --experimental flag.
diff --git a/test/cmdlineTests/experimental_feature_without_experimental_flag/exit b/test/cmdlineTests/experimental_feature_without_experimental_flag/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/experimental_feature_without_experimental_flag/input.sol b/test/cmdlineTests/experimental_feature_without_experimental_flag/input.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
+pragma solidity >=0.0;
+
+contract C {
+	function f() public {}
+}
diff --git a/test/cmdlineTests/experimental_flag_with_standard_json/args b/test/cmdlineTests/experimental_flag_with_standard_json/args
@@ -0,0 +1 @@
+--experimental
diff --git a/test/cmdlineTests/experimental_flag_with_standard_json/err b/test/cmdlineTests/experimental_flag_with_standard_json/err
@@ -0,0 +1 @@
+Error: Standard JSON input mode is incompatible with the --experimental flag. Please use the appropriate experimental option in your Standard JSON input file to enable experimental mode.
diff --git a/test/cmdlineTests/experimental_flag_with_standard_json/exit b/test/cmdlineTests/experimental_flag_with_standard_json/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/experimental_flag_with_standard_json/input.json b/test/cmdlineTests/experimental_flag_with_standard_json/input.json
diff --git a/test/cmdlineTests/import_asm_json_all_valid_flags/args b/test/cmdlineTests/import_asm_json_all_valid_flags/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --combined-json bin,bin-runtime,opcodes,asm,srcmap,srcmap-runtime --asm --bin --bin-runtime --asm-json --import-asm-json -
+--experimental --pretty-json --json-indent 4 --combined-json bin,bin-runtime,opcodes,asm,srcmap,srcmap-runtime --asm --bin --bin-runtime --asm-json --import-asm-json -
diff --git a/test/cmdlineTests/import_asm_json_difficulty_prevrandao/args b/test/cmdlineTests/import_asm_json_difficulty_prevrandao/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_eof_unavailable_before_osaka/args b/test/cmdlineTests/import_asm_json_eof_unavailable_before_osaka/args
@@ -1 +1 @@
---import-asm-json --experimental-eof-version 1 --evm-version cancun
+--experimental --import-asm-json --experimental-eof-version 1 --evm-version cancun
diff --git a/test/cmdlineTests/import_asm_json_hex_subassembly_indices/args b/test/cmdlineTests/import_asm_json_hex_subassembly_indices/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_invalid_data_not_hex/args b/test/cmdlineTests/import_asm_json_invalid_data_not_hex/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_invalid_data_not_object/args b/test/cmdlineTests/import_asm_json_invalid_data_not_object/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/args b/test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_invalid_value/args b/test/cmdlineTests/import_asm_json_invalid_value/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_missing_subobject_indices/args b/test/cmdlineTests/import_asm_json_missing_subobject_indices/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_no_optimize/args b/test/cmdlineTests/import_asm_json_no_optimize/args
@@ -1 +1 @@
---import-asm-json - --asm
+--experimental --import-asm-json - --asm
diff --git a/test/cmdlineTests/import_asm_json_no_value/args b/test/cmdlineTests/import_asm_json_no_value/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_non_unique_sources/args b/test/cmdlineTests/import_asm_json_non_unique_sources/args
@@ -1 +1 @@
---asm-json --import-asm-json -
+--experimental --asm-json --import-asm-json -
diff --git a/test/cmdlineTests/import_asm_json_optimize/args b/test/cmdlineTests/import_asm_json_optimize/args
@@ -1 +1 @@
---optimize --import-asm-json - --asm
+--experimental --optimize --import-asm-json - --asm
diff --git a/test/cmdlineTests/import_asm_json_out_of_range_data_index/args b/test/cmdlineTests/import_asm_json_out_of_range_data_index/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_random_order_data_index/args b/test/cmdlineTests/import_asm_json_random_order_data_index/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_unrecognized_field/args b/test/cmdlineTests/import_asm_json_unrecognized_field/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_untagged_jumpdest/args b/test/cmdlineTests/import_asm_json_untagged_jumpdest/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_verbatim/args b/test/cmdlineTests/import_asm_json_verbatim/args
@@ -1 +1 @@
---import-asm-json - --opcodes --asm
+--experimental --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/import_asm_json_yul_more_subobjects/args b/test/cmdlineTests/import_asm_json_yul_more_subobjects/args
@@ -1 +1 @@
---import-asm-json - --opcodes
+--experimental --import-asm-json - --opcodes
diff --git a/test/cmdlineTests/import_asm_json_yul_subobjects/args b/test/cmdlineTests/import_asm_json_yul_subobjects/args
@@ -1 +1 @@
---import-asm-json - --opcodes
+--experimental --import-asm-json - --opcodes
diff --git a/test/cmdlineTests/standard_cli_import_ast_storage_layout_specifier_missing_expression/args b/test/cmdlineTests/standard_cli_import_ast_storage_layout_specifier_missing_expression/args
@@ -1 +1 @@
---import-ast -
+--experimental --import-ast -
diff --git a/test/cmdlineTests/strict_asm_eof_container_osaka/args b/test/cmdlineTests/strict_asm_eof_container_osaka/args
@@ -1 +1 @@
- --strict-assembly --experimental-eof-version 1 --evm-version osaka --asm --ir-optimized --bin --debug-info none
+--experimental  --strict-assembly --experimental-eof-version 1 --evm-version osaka --asm --ir-optimized --bin --debug-info none
diff --git a/test/cmdlineTests/strict_asm_eof_dataloadn_osaka/args b/test/cmdlineTests/strict_asm_eof_dataloadn_osaka/args
@@ -1 +1 @@
- --strict-assembly --experimental-eof-version 1 --evm-version osaka --asm --ir-optimized --bin --debug-info none
+--experimental  --strict-assembly --experimental-eof-version 1 --evm-version osaka --asm --ir-optimized --bin --debug-info none
diff --git a/test/cmdlineTests/strict_asm_eof_unavailable_before_osaka/args b/test/cmdlineTests/strict_asm_eof_unavailable_before_osaka/args
@@ -1 +1 @@
---strict-assembly --experimental-eof-version 1 --evm-version cancun
+--experimental --strict-assembly --experimental-eof-version 1 --evm-version cancun
diff --git a/test/cmdlineTests/strict_asm_yul_cfg_json_export/args b/test/cmdlineTests/strict_asm_yul_cfg_json_export/args
@@ -1 +1 @@
---strict-assembly --optimize --yul-cfg-json --pretty-json --json-indent 4
+--experimental --strict-assembly --optimize --yul-cfg-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/undeployable_contract_empty_outputs/args b/test/cmdlineTests/undeployable_contract_empty_outputs/args
@@ -1 +1 @@
---bin --bin-runtime --opcodes --asm --ir --ir-ast-json --ir-optimized --ir-optimized-ast-json --gas --asm-json --abi --hashes --optimize --pretty-json --json-indent 4
+--experimental --bin --bin-runtime --opcodes --asm --ir --ir-ast-json --ir-optimized --ir-optimized-ast-json --gas --asm-json --abi --hashes --optimize --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/yul_cfg_json_export/args b/test/cmdlineTests/yul_cfg_json_export/args
@@ -1 +1 @@
---via-ir --optimize --yul-cfg-json --pretty-json --json-indent 4
+--experimental --via-ir --optimize --yul-cfg-json --pretty-json --json-indent 4
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
@@ -66,7 +66,7 @@ evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 	BOOST_CHECK(!!sourceUnit);
 
 	Scoper::assignScopes(*sourceUnit);
-	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
+	BOOST_REQUIRE(SyntaxChecker(errorReporter, false, false).checkSyntax(*sourceUnit));
 	GlobalContext globalContext(solidity::test::CommonOptions::get().evmVersion());
 	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter, false);
 	DeclarationTypeChecker declarationTypeChecker(errorReporter, solidity::test::CommonOptions::get().evmVersion());

diff --git a/test/libsolidity/FunctionDependencyGraphTest.cpp b/test/libsolidity/FunctionDependencyGraphTest.cpp
@@ -42,6 +42,8 @@ TestCase::TestResult FunctionDependencyGraphTest::run(std::ostream& _stream, std
 	compiler().setSources(StringMap{{"", m_source}});
 	compiler().setViaIR(true);
 	compiler().setOptimiserSettings(OptimiserSettings::none());
+	// Experimental on by default as this is an extension of the initial experimental Solidity
+	compiler().setExperimental(true);
 	if (!compiler().compile(CompilerStack::AnalysisSuccessful))
 	{
 		printPrefixed(_stream, formatErrors(filteredErrors(), _formatted), _linePrefix);

diff --git a/test/libsolidity/FunctionDependencyGraphTest.h b/test/libsolidity/FunctionDependencyGraphTest.h
@@ -24,8 +24,6 @@
 
 #include <iosfwd>
 #include <string>
-#include <vector>
-#include <utility>
 
 namespace solidity::frontend::test
 {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--pretty-json --json-indent 4 --import-asm-json -
		--pretty-json --json-indent 4 --experimental --import-asm-json -
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--import-asm-json - --opcodes --asm --bin --asm-json --pretty-json --json-indent 4
		--experimental --import-asm-json - --opcodes --asm --bin --asm-json --pretty-json --json-indent 4
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--ir-ast-json --ir-optimized-ast-json --optimize --pretty-json --json-indent 4
		--experimental --ir-ast-json --ir-optimized-ast-json --optimize --pretty-json --json-indent 4
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--evm-version=homestead --import-ast --combined-json ast --pretty-json
		--experimental --evm-version=homestead --import-ast --combined-json ast --pretty-json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--optimize --experimental-eof-version 1 --evm-version cancun
		--experimental --optimize --experimental-eof-version 1 --evm-version cancun
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Error: --debug-info ethdebug can only be used by toggling the --experimental flag.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--experimental-eof-version 1 --evm-version osaka --ethdebug --via-ir --pretty-json --json-indent 4
		--experimental --experimental-eof-version 1 --evm-version osaka --ethdebug --via-ir --pretty-json --json-indent 4
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--ethdebug --via-ir --pretty-json --json-indent 4
		--experimental --ethdebug --via-ir --pretty-json --json-indent 4
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Error: The following options are only available in experimental mode: --lsp, --import-ast, --import-asm-json, --ir-ast-json, --ir-optimized-ast-json, --yul-cfg-json, --ethdebug, --ethdebug-runtime, --experimental-eof-version. To toggle experimental mode, use the --experimental flag.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Error: Standard JSON input mode is incompatible with the --experimental flag. Please use the appropriate experimental option in your Standard JSON input file to enable experimental mode.