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

fixup! [Refactor] Add AssemblyItem as param to copyRoutine

Browse Source
This commit is contained in:
Matheus Aguiar 2023-08-21 16:18:21 -03:00
parent 562b6ea7a8
commit 0831f1bff2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libevmasm/ConstantOptimiser.cpp
View File

@ -159,6 +159,11 @@ AssemblyItems CodeCopyMethod::execute(Assembly& _assembly) const
AssemblyItems CodeCopyMethod::copyRoutine(AssemblyItem* _pushData) const AssemblyItems CodeCopyMethod::copyRoutine(AssemblyItem* _pushData) const
{ {
if (_pushData)
assertThrow(_pushData->type() == PushData, OptimizerException, "Invalid Assembly Item.");
AssemblyItem dataUsed = _pushData ? *_pushData : AssemblyItem(PushData, u256(1) << 16);
// PUSH0 is cheaper than PUSHn/DUP/SWAP. // PUSH0 is cheaper than PUSHn/DUP/SWAP.
if (m_params.evmVersion.hasPush0()) if (m_params.evmVersion.hasPush0())
{ {
@ -171,7 +176,7 @@ AssemblyItems CodeCopyMethod::copyRoutine(AssemblyItem* _pushData) const
// codecopy(0, <offset>, 32) // codecopy(0, <offset>, 32)
u256(32), u256(32),
(_pushData ? *_pushData : AssemblyItem(PushData, u256(1) << 16)), dataUsed,
u256(0), u256(0),
Instruction::CODECOPY, Instruction::CODECOPY,
@ -201,7 +206,7 @@ AssemblyItems CodeCopyMethod::copyRoutine(AssemblyItem* _pushData) const
// codecopy(0, <offset>, 32) // codecopy(0, <offset>, 32)
u256(32), u256(32),
(_pushData ? *_pushData : AssemblyItem(PushData, u256(1) << 16)), dataUsed,
Instruction::DUP4, Instruction::DUP4,
Instruction::CODECOPY, Instruction::CODECOPY,