cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disallowed option --experimental-via-ir in Assembler, Linker and StandardJson input modes

Browse Source
This commit is contained in:
Midhun07 2021-08-27 21:40:41 +05:30
parent ab6b430c1f
commit 11065c6e79
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -8,6 +8,7 @@ Compiler Features:
* Immutable variables can be read at construction time once they are initialized. * Immutable variables can be read at construction time once they are initialized.
* SMTChecker: Support low level ``call`` as external calls to unknown code. * SMTChecker: Support low level ``call`` as external calls to unknown code.
* SMTChecker: Add constraints to better correlate ``address(this).balance`` and ``msg.value``. * 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: Bugfixes:

10
solc/CommandLineParser.cpp
View File

@ -927,6 +927,16 @@ General Information)").c_str(),
else else
m_options.input.mode = InputMode::Compiler; 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()) if (!parseInputPathsAndRemappings())
return false; return false;

28
test/solc/CommandLineParser.cpp
View File

@ -262,7 +262,6 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
"--error-recovery", // Ignored in assembly mode "--error-recovery", // Ignored in assembly mode
"--overwrite", "--overwrite",
"--evm-version=spuriousDragon", "--evm-version=spuriousDragon",
"--experimental-via-ir", // Ignored in assembly mode
"--revert-strings=strip", // Accepted but has no effect in assembly mode "--revert-strings=strip", // Accepted but has no effect in assembly mode
"--pretty-json", "--pretty-json",
"--json-indent=1", "--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 "--output-dir=/tmp/out", // Accepted but has no effect in Standard JSON mode
"--overwrite", // 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 "--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 "--revert-strings=strip", // Accepted but has no effect in Standard JSON mode
"--pretty-json", "--pretty-json",
"--json-indent=1", "--json-indent=1",
@ -422,6 +420,32 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
BOOST_TEST(parsedOptions.value() == expectedOptions); 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() BOOST_AUTO_TEST_SUITE_END()
} // namespace solidity::frontend::test } // namespace solidity::frontend::test