Skip to content

Commit 01a1316

Browse files
chrisethcameel
authored andcommitted
Only set "runs" if used.
1 parent c89b46c commit 01a1316

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

solc/CommandLineParser.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,8 @@ General Information)").c_str(),
967967
m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
968968
m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);
969969

970-
m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
970+
if (!m_args[g_strOptimizeRuns].defaulted())
971+
m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
971972

972973
if (m_args.count(g_strYulOptimizations))
973974
{
@@ -1132,7 +1133,8 @@ General Information)").c_str(),
11321133
m_args.count(g_strModelCheckerTargets) ||
11331134
m_args.count(g_strModelCheckerTimeout);
11341135
m_options.output.experimentalViaIR = (m_args.count(g_strExperimentalViaIR) > 0);
1135-
m_options.optimizer.expectedExecutionsPerDeployment = m_args[g_strOptimizeRuns].as<unsigned>();
1136+
if (!m_args[g_strOptimizeRuns].defaulted())
1137+
m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
11361138

11371139
m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
11381140
m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);

test/solc/CommandLineParser.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ BOOST_AUTO_TEST_CASE(no_options)
7878

7979
CommandLineOptions expectedOptions;
8080
expectedOptions.input.paths = {"contract.sol"};
81-
expectedOptions.optimizer.expectedExecutionsPerDeployment = 200;
8281
expectedOptions.modelChecker.initialize = true;
8382
expectedOptions.modelChecker.settings = {
8483
ModelCheckerContracts::Default(),
@@ -334,8 +333,6 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
334333
expectedOptions.optimizer.yulSteps = "agf";
335334
expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
336335
}
337-
else
338-
expectedOptions.optimizer.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
339336

340337
stringstream sout, serr;
341338
optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);

0 commit comments

Comments
 (0)