From 11065c6e79cb985bbe6bbfc861812546807189a1 Mon Sep 17 00:00:00 2001
From: Midhun07 <midhun0407@gmail.com>
Date: Fri, 27 Aug 2021 21:40:41 +0530
Subject: [PATCH] Disallowed option --experimental-via-ir in Assembler, Linker
 and StandardJson input modes

---
 Changelog.md                    |  1 +
 solc/CommandLineParser.cpp      | 10 ++++++++++
 test/solc/CommandLineParser.cpp | 28 ++++++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b569023c5..84f756b1c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
  * Immutable variables can be read at construction time once they are initialized.
  * SMTChecker: Support low level ``call`` as external calls to unknown code.
  * SMTChecker: Add constraints to better correlate ``address(this).balance`` and ``msg.value``.
+ * Commandline Interface: Disallowed the ``--experimental-via-ir`` option to be used with Standard Json, Assembler and Linker modes.
 
 
 Bugfixes:
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 0ccd99d0b..8ce0dfcfe 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -927,6 +927,16 @@ General Information)").c_str(),
 	else
 		m_options.input.mode = InputMode::Compiler;
 
+	if (
+		m_args.count(g_strExperimentalViaIR) > 0 &&
+		m_options.input.mode != InputMode::Compiler &&
+		m_options.input.mode != InputMode::CompilerWithASTImport
+	)
+	{
+		serr() << "The option --" << g_strExperimentalViaIR << " is only supported in the compiler mode." << endl;
+		return false;
+	}
+
 	if (!parseInputPathsAndRemappings())
 		return false;
 
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index d13c8a27b..1e3a53162 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -262,7 +262,6 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			"--error-recovery",            // Ignored in assembly mode
 			"--overwrite",
 			"--evm-version=spuriousDragon",
-			"--experimental-via-ir",       // Ignored in assembly mode
 			"--revert-strings=strip",      // Accepted but has no effect in assembly mode
 			"--pretty-json",
 			"--json-indent=1",
@@ -357,7 +356,6 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 		"--output-dir=/tmp/out",           // Accepted but has no effect in Standard JSON mode
 		"--overwrite",                     // Accepted but has no effect in Standard JSON mode
 		"--evm-version=spuriousDragon",    // Ignored in Standard JSON mode
-		"--experimental-via-ir",           // Ignored in Standard JSON mode
 		"--revert-strings=strip",          // Accepted but has no effect in Standard JSON mode
 		"--pretty-json",
 		"--json-indent=1",
@@ -422,6 +420,32 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 	BOOST_TEST(parsedOptions.value() == expectedOptions);
 }
 
+BOOST_AUTO_TEST_CASE(experimental_via_ir_invalid_input_modes)
+{
+	static array<string, 5> const inputModeOptions = {
+		"--assemble",
+		"--yul",
+		"--strict-assembly",
+		"--standard-json",
+		"--link",
+	};
+	for (string const& inputModeOption: inputModeOptions)
+	{
+		stringstream sout, serr;
+		vector<string> commandLine = {
+			"solc",
+			"--experimental-via-ir",
+			"file",
+			inputModeOption,
+		};
+		optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);
+
+		BOOST_TEST(sout.str() == "");
+		BOOST_TEST(serr.str() == "The option --experimental-via-ir is only supported in the compiler mode.\n");
+		BOOST_REQUIRE(!parsedOptions.has_value());
+	}
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace solidity::frontend::test