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

Merge pull request #11720 from ethereum/onlySetRunsIfUsed

Browse Source 
Only set "runs" if used.
This commit is contained in:
chriseth 2021-08-03 16:34:31 +02:00 committed by GitHub
commit ffd66a5d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solc/CommandLineParser.cpp
View File

@ -967,7 +967,8 @@ General Information)").c_str(),
m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0); m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0); m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);
m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>(); if (!m_args[g_strOptimizeRuns].defaulted())
m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
if (m_args.count(g_strYulOptimizations)) if (m_args.count(g_strYulOptimizations))
{ {
@ -1132,7 +1133,8 @@ General Information)").c_str(),
m_args.count(g_strModelCheckerTargets) || m_args.count(g_strModelCheckerTargets) ||
m_args.count(g_strModelCheckerTimeout); m_args.count(g_strModelCheckerTimeout);
m_options.output.experimentalViaIR = (m_args.count(g_strExperimentalViaIR) > 0); m_options.output.experimentalViaIR = (m_args.count(g_strExperimentalViaIR) > 0);
m_options.optimizer.expectedExecutionsPerDeployment = m_args[g_strOptimizeRuns].as<unsigned>(); if (!m_args[g_strOptimizeRuns].defaulted())
m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0); m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0); m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);

3
test/solc/CommandLineParser.cpp
View File

@ -78,7 +78,6 @@ BOOST_AUTO_TEST_CASE(no_options)
CommandLineOptions expectedOptions; CommandLineOptions expectedOptions;
expectedOptions.input.paths = {"contract.sol"}; expectedOptions.input.paths = {"contract.sol"};
expectedOptions.optimizer.expectedExecutionsPerDeployment = 200;
expectedOptions.modelChecker.initialize = true; expectedOptions.modelChecker.initialize = true;
expectedOptions.modelChecker.settings = { expectedOptions.modelChecker.settings = {
ModelCheckerContracts::Default(), ModelCheckerContracts::Default(),
@ -334,8 +333,6 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
expectedOptions.optimizer.yulSteps = "agf"; expectedOptions.optimizer.yulSteps = "agf";
expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000; expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
} }
else
expectedOptions.optimizer.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
stringstream sout, serr; stringstream sout, serr;
optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr); optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);