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

lazy expansion

Browse Source
This commit is contained in:
chriseth 2022-06-20 17:10:43 +02:00
parent c1db562347
commit 6a8b567662
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libyul/optimiser/KnowledgeBase.cpp
View File

@ -191,9 +191,9 @@ private:
return std::nullopt;
},
[&](Identifier const& _identifier) -> optional<SumExpression> {
if (m_expandedVariables.count(_identifier.name))
/*if (m_expandedVariables.count(_identifier.name))
return m_expandedVariables.at(_identifier.name);
else
else*/
return SumExpression::variable(_identifier.name);
},
[&](Literal const& _literal) -> optional<SumExpression> {
@ -211,14 +211,22 @@ private:
if (assignedValue->value)
if (auto newValue = toSumExpression(*assignedValue->value))
{
// cout << " to " << newValue->toString() << endl;
// TODO this will be exponential.
// TODO Expand lazily only in the expression itself?
for (auto& [variable, value]: m_expandedVariables)
expandInExpression(value, _variable, *newValue);
expandInExpression(_currentExpression, _variable, *newValue);
m_expandedVariables[_variable] = move(*newValue);
return;
bool expanded = false;
do
{
expanded = false;
for (auto&& [var, value]: _currentExpression.coefficients)
if (m_expandedVariables.count(var))
{
expandInExpression(_currentExpression, var, m_expandedVariables[var]);
expanded = true;
break;
}
}
while (expanded);
}
m_expandedFailedVariables.insert(_variable);
}