cerc-io/solidity
10
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

Simplify compressStack.

Browse Source
This commit is contained in:
Daniel Kirchner 2021-08-16 17:18:42 +02:00
parent a58694ca4d
commit 79d39d241c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libyul/backends/evm/StackLayoutGenerator.cpp
View File

@ -553,18 +553,22 @@ Stack StackLayoutGenerator::compressStack(Stack _stack)
{ {
if (firstDupOffset) if (firstDupOffset)
{ {
if (_stack.size() - *firstDupOffset - 1 > 1)
std::swap(_stack.at(*firstDupOffset + 1), _stack.back());
std::swap(_stack.at(*firstDupOffset), _stack.back()); std::swap(_stack.at(*firstDupOffset), _stack.back());
_stack.pop_back(); _stack.pop_back();
firstDupOffset.reset(); firstDupOffset.reset();
} }
for (auto&& [offset, slot]: _stack | ranges::views::enumerate) for (auto&& [depth, slot]: _stack | ranges::views::reverse | ranges::views::enumerate)
if (canBeFreelyGenerated(slot)) if (canBeFreelyGenerated(slot))
firstDupOffset = offset; {
else if (auto dupOffset = util::findOffset(_stack | ranges::views::take(offset), slot)) firstDupOffset = _stack.size() - depth - 1;
if (_stack.size() - *dupOffset <= 16) break;
firstDupOffset = offset; }
else if (auto dupDepth = util::findOffset(_stack | ranges::views::reverse | ranges::views::drop(depth + 1), slot))
if (depth + *dupDepth <= 16)
{
firstDupOffset = _stack.size() - depth - 1;
break;
}
} }
while (firstDupOffset); while (firstDupOffset);
return _stack; return _stack;