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

fix multi assignmnets

Browse Source
This commit is contained in:
chriseth 2022-04-17 18:25:27 +02:00
parent 9da8d7f28c
commit ecb90b69bd
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libyul/optimiser/ReasoningBasedSimplifier.cpp
View File

@ -158,6 +158,15 @@ void ReasoningBasedSimplifier::operator()(FunctionDefinition& _fun)
{ {
ScopedSaveAndRestore counters(m_variableSequenceCounter, {}); ScopedSaveAndRestore counters(m_variableSequenceCounter, {});
ScopedSaveAndRestore pathCond(m_pathCondition, true); ScopedSaveAndRestore pathCond(m_pathCondition, true);
for (auto const& param: _fun.parameters)
encodeVariableUpdateUnknown(param.name);
for (auto const& retVar: _fun.returnVariables)
{
encodeVariableUpdateUnknown(retVar.name);
// TODO remove the redundant encoding above
m_solver->addAssertion(currentVariableExpression(retVar.name) == 0);
}
ASTModifier::operator()(_fun); ASTModifier::operator()(_fun);
} }

18
libyul/optimiser/SMTSolver.cpp
View File

@ -160,12 +160,19 @@ void SMTSolver::encodeVariableDeclaration(VariableDeclaration const& _varDecl)
_varDecl.value _varDecl.value
) )
encodeVariableUpdate(_varDecl.variables.front().name, *_varDecl.value); encodeVariableUpdate(_varDecl.variables.front().name, *_varDecl.value);
else
for (auto const& var: _varDecl.variables)
encodeVariableUpdateUnknown(var.name);
} }
void SMTSolver::encodeVariableAssignment(Assignment const& _assignment) void SMTSolver::encodeVariableAssignment(Assignment const& _assignment)
{ {
if (_assignment.variableNames.size() == 1) if (_assignment.variableNames.size() == 1)
encodeVariableUpdate(_assignment.variableNames.front().name, *_assignment.value); encodeVariableUpdate(_assignment.variableNames.front().name, *_assignment.value);
else
for (auto const& var: _assignment.variableNames)
encodeVariableUpdateUnknown(var.name);
} }
void SMTSolver::encodeVariableUpdate(YulString const& _name, Expression const& _value) void SMTSolver::encodeVariableUpdate(YulString const& _name, Expression const& _value)
@ -179,3 +186,14 @@ void SMTSolver::encodeVariableUpdate(YulString const& _name, Expression const& _
m_solver->newVariable(variableNameAtIndex(_name, m_variableSequenceCounter[_name]), defaultSort()); m_solver->newVariable(variableNameAtIndex(_name, m_variableSequenceCounter[_name]), defaultSort());
m_solver->addAssertion(currentVariableExpression(_name) == value); m_solver->addAssertion(currentVariableExpression(_name) == value);
} }
void SMTSolver::encodeVariableUpdateUnknown(const YulString& _name)
{
if (m_variableSequenceCounter.count(_name))
++m_variableSequenceCounter[_name];
else
m_variableSequenceCounter[_name] = 1;
m_solver->newVariable(variableNameAtIndex(_name, m_variableSequenceCounter[_name]), defaultSort());
m_solver->addAssertion(0 <= currentVariableExpression(_name) && currentVariableExpression(_name) <= (bigint(1) << 256) - 1);
}

1
libyul/optimiser/SMTSolver.h
View File

@ -53,6 +53,7 @@ protected:
void encodeVariableDeclaration(VariableDeclaration const& _varDecl); void encodeVariableDeclaration(VariableDeclaration const& _varDecl);
void encodeVariableAssignment(Assignment const& _assignment); void encodeVariableAssignment(Assignment const& _assignment);
void encodeVariableUpdate(YulString const& _name, Expression const& _value); void encodeVariableUpdate(YulString const& _name, Expression const& _value);
void encodeVariableUpdateUnknown(YulString const& _name);
/// The encoding for a builtin. The type of encoding determines what we are /// The encoding for a builtin. The type of encoding determines what we are
/// solving for. /// solving for.