Skip to content

Commit e0c837b

Browse files
committed
Remove isCreation flag from OptimiserSettings.
1 parent b57e856 commit e0c837b

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

libevmasm/Assembly.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -411,14 +411,11 @@ map<u256, u256> const& Assembly::optimiseInternal(
411411
if (m_tagReplacements)
412412
return *m_tagReplacements;
413413

414-
assertThrow(_settings.isCreation == m_creation, OptimizerException, "Mismatching creation settings.");
415-
416414
// Run optimisation for sub-assemblies.
417415
for (size_t subId = 0; subId < m_subs.size(); ++subId)
418416
{
419417
OptimiserSettings settings = _settings;
420418
Assembly& sub = *m_subs[subId];
421-
settings.isCreation = sub.isCreation();
422419
map<u256, u256> const& subTagReplacements = sub.optimiseInternal(
423420
settings,
424421
JumpdestRemover::referencedTags(m_items, subId)
@@ -438,7 +435,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
438435
m_items,
439436
_tagsReferencedFromOutside,
440437
_settings.expectedExecutionsPerDeployment,
441-
_settings.isCreation,
438+
isCreation(),
442439
_settings.evmVersion
443440
}.optimise();
444441

@@ -539,8 +536,8 @@ map<u256, u256> const& Assembly::optimiseInternal(
539536

540537
if (_settings.runConstantOptimiser)
541538
ConstantOptimisationMethod::optimiseConstants(
542-
_settings.isCreation,
543-
_settings.isCreation ? 1 : _settings.expectedExecutionsPerDeployment,
539+
isCreation(),
540+
isCreation() ? 1 : _settings.expectedExecutionsPerDeployment,
544541
_settings.evmVersion,
545542
*this
546543
);

libevmasm/Assembly.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ class Assembly
117117

118118
struct OptimiserSettings
119119
{
120-
bool isCreation = false;
121120
bool runInliner = false;
122121
bool runJumpdestRemover = false;
123122
bool runPeephole = false;

libsolidity/codegen/CompilerContext.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,7 @@ void CompilerContext::updateSourceLocation()
572572
evmasm::Assembly::OptimiserSettings CompilerContext::translateOptimiserSettings(OptimiserSettings const& _settings)
573573
{
574574
// Constructing it this way so that we notice changes in the fields.
575-
evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, false, m_evmVersion, 0};
576-
asmSettings.isCreation = true;
575+
evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, m_evmVersion, 0};
577576
asmSettings.runInliner = _settings.runInliner;
578577
asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
579578
asmSettings.runPeephole = _settings.runPeephole;

libyul/AssemblyStack.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ evmasm::Assembly::OptimiserSettings translateOptimiserSettings(
7272
)
7373
{
7474
// Constructing it this way so that we notice changes in the fields.
75-
evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, false, _evmVersion, 0};
76-
asmSettings.isCreation = true;
75+
evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, _evmVersion, 0};
7776
asmSettings.runInliner = _settings.runInliner;
7877
asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
7978
asmSettings.runPeephole = _settings.runPeephole;

test/libevmasm/Optimiser.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,6 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
12781278
main.append(u256(8));
12791279

12801280
Assembly::OptimiserSettings settings;
1281-
settings.isCreation = false;
12821281
settings.runInliner = false;
12831282
settings.runJumpdestRemover = true;
12841283
settings.runPeephole = true;
@@ -1287,7 +1286,7 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
12871286
settings.runConstantOptimiser = true;
12881287
settings.evmVersion = solidity::test::CommonOptions::get().evmVersion();
12891288
settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
1290-
;
1289+
12911290
main.optimise(settings);
12921291

12931292
AssemblyItems expectationMain{

0 commit comments

Comments
 (0)