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

Optimise AssemblyItem::m_data.

Browse Source
This commit is contained in:
chriseth committed 2017-01-12 17:52:26 +01:00
1 parent 74d74fb00b
commit afad40ac5a
5 files changed
+59 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libevmasm/ExpressionClasses.cpp
+19 -4
View File
@@ -40,8 +40,18 @@ bool ExpressionClasses::Expression::operator<(ExpressionClasses::Expression cons
assertThrow(!!item && !!_other.item, OptimizerException, "");
auto type = item->type();
auto otherType = _other.item->type();
return std::tie(type, item->data(), arguments, sequenceNumber) <
std::tie(otherType, _other.item->data(), _other.arguments, _other.sequenceNumber);
if (type != otherType)
return type < otherType;
else if (type == Operation)
{
auto instr = item->instruction();
auto otherInstr = _other.item->instruction();
return std::tie(instr, arguments, sequenceNumber) <
std::tie(otherInstr, _other.arguments, _other.sequenceNumber);
}
else
return std::tie(item->data(), arguments, sequenceNumber) <
std::tie(_other.item->data(), _other.arguments, _other.sequenceNumber);
}
ExpressionClasses::Id ExpressionClasses::find(
@@ -479,8 +489,13 @@ bool Pattern::matchesBaseItem(AssemblyItem const* _item) const
return false;
if (m_type != _item->type())
return false;
if (m_requireDataMatch && m_data != _item->data())
return false;
if (m_requireDataMatch)
{
if (m_type == Operation)
return m_data == u256(byte(_item->instruction()));
else
return m_data == _item->data();
}
return true;
}