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 conditions.

Browse Source
This commit is contained in:
chriseth 2022-03-21 11:24:54 +01:00
parent afc56db6d5
commit 24068116d9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libyul/optimiser/ReasoningBasedSimplifier.cpp
View File

@ -118,7 +118,7 @@ void ReasoningBasedSimplifier::operator()(ForLoop& _for)
cout << "Checking if condition can be false" << endl; cout << "Checking if condition can be false" << endl;
smtutil::Expression condition = encodeExpression(*_for.condition); smtutil::Expression condition = encodeExpression(*_for.condition);
m_solver->push(); m_solver->push();
m_solver->addAssertion(condition == constantValue(0)); m_solver->addAssertion(condition <= constantValue(0));
cout << " running check" << endl; cout << " running check" << endl;
CheckResult result = m_solver->check({}).first; CheckResult result = m_solver->check({}).first;
m_solver->pop(); m_solver->pop();
@ -133,7 +133,7 @@ void ReasoningBasedSimplifier::operator()(ForLoop& _for)
{ {
cout << "Checking if condition can be true" << endl; cout << "Checking if condition can be true" << endl;
m_solver->push(); m_solver->push();
m_solver->addAssertion(condition != constantValue(0)); m_solver->addAssertion(condition >= constantValue(1));
cout << " running check" << endl; cout << " running check" << endl;
CheckResult result2 = m_solver->check({}).first; CheckResult result2 = m_solver->check({}).first;
m_solver->pop(); m_solver->pop();
@ -151,7 +151,7 @@ void ReasoningBasedSimplifier::operator()(ForLoop& _for)
m_solver->push(); m_solver->push();
cout << "Setting condition true inside body" << endl; cout << "Setting condition true inside body" << endl;
m_solver->addAssertion(condition != constantValue(0)); m_solver->addAssertion(condition >= constantValue(1));
ASTModifier::operator()(_for.body); ASTModifier::operator()(_for.body);
ASTModifier::operator()(_for.post); ASTModifier::operator()(_for.post);
@ -325,7 +325,8 @@ smtutil::Expression ReasoningBasedSimplifier::encodeEVMBuiltin(
smtutil::Expression ReasoningBasedSimplifier::newZeroOneVariable() smtutil::Expression ReasoningBasedSimplifier::newZeroOneVariable()
{ {
smtutil::Expression var = newVariable(); smtutil::Expression var = newVariable();
m_solver->addAssertion(var == 0 || var == 1); m_solver->addAssertion(var <= 1);
m_solver->addAssertion(var <= 0 || var >= 1);
return var; return var;
} }