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

Merge pull request #6668 from ethereum/smt_fix_short_circuit

Browse Source 
Fix short circuit with assignments
This commit is contained in:
chriseth 2019-05-06 11:40:07 +02:00 committed by GitHub
commit dee1c1109c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 86 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/formal/SMTChecker.cpp
View File

@ -1230,17 +1230,16 @@ void SMTChecker::booleanOperation(BinaryOperation const& _op)
{ {
// @TODO check that both of them are not constant // @TODO check that both of them are not constant
_op.leftExpression().accept(*this); _op.leftExpression().accept(*this);
auto touchedVars = touchedVariables(_op.leftExpression());
if (_op.getOperator() == Token::And) if (_op.getOperator() == Token::And)
{ {
auto indicesAfterSecond = visitBranch(&_op.rightExpression(), expr(_op.leftExpression())); auto indicesAfterSecond = visitBranch(&_op.rightExpression(), expr(_op.leftExpression()));
mergeVariables(touchedVars, !expr(_op.leftExpression()), copyVariableIndices(), indicesAfterSecond); mergeVariables(touchedVariables(_op.rightExpression()), !expr(_op.leftExpression()), copyVariableIndices(), indicesAfterSecond);
defineExpr(_op, expr(_op.leftExpression()) && expr(_op.rightExpression())); defineExpr(_op, expr(_op.leftExpression()) && expr(_op.rightExpression()));
} }
else else
{ {
auto indicesAfterSecond = visitBranch(&_op.rightExpression(), !expr(_op.leftExpression())); auto indicesAfterSecond = visitBranch(&_op.rightExpression(), !expr(_op.leftExpression()));
mergeVariables(touchedVars, expr(_op.leftExpression()), copyVariableIndices(), indicesAfterSecond); mergeVariables(touchedVariables(_op.rightExpression()), expr(_op.leftExpression()), copyVariableIndices(), indicesAfterSecond);
defineExpr(_op, expr(_op.leftExpression()) || expr(_op.rightExpression())); defineExpr(_op, expr(_op.leftExpression()) || expr(_op.rightExpression()));
} }
} }

19
test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol Normal file
View File

@ -0,0 +1,19 @@
pragma experimental SMTChecker;
contract C
{
bool b;
function f() public {
if ((b = false) && (b == true)) {}
if ((b == false) && (b = true)) {}
if ((b = false) && (b = true)) {}
if ((b == false) && (b == true)) {}
if ((b = true) && b) {}
}
}
// ----
// Warning: (84-110): Condition is always false.
// Warning: (121-147): Condition is always true.
// Warning: (158-183): Condition is always false.
// Warning: (194-221): Condition is always false.
// Warning: (232-247): Condition is always true.

23
test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol Normal file
View File

@ -0,0 +1,23 @@
pragma experimental SMTChecker;
contract C
{
bool b;
function g(bool _b) internal returns (bool) {
b = _b;
return b;
}
function f() public {
if (g(false) && (b == true)) {}
if ((b == false) && g(true)) {}
if (g(false) && g(true)) {}
if (g(false) && (b == true)) {}
if (g(true) && b) {}
}
}
// ----
// Warning: (156-179): Condition is always false.
// Warning: (190-213): Condition is always true.
// Warning: (224-243): Condition is always false.
// Warning: (254-277): Condition is always false.
// Warning: (288-300): Condition is always true.

19
test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol Normal file
View File

@ -0,0 +1,19 @@
pragma experimental SMTChecker;
contract C
{
bool b;
function f() public {
if ((b = true) || (b == false)) {}
if ((b == true) || (b = false)) {}
if ((b = true) || (b = false)) {}
if ((b == true) || (b == false)) {}
if ((b = false) || b) {}
}
}
// ----
// Warning: (84-110): Condition is always true.
// Warning: (121-147): Condition is always true.
// Warning: (158-183): Condition is always true.
// Warning: (194-221): Condition is always true.
// Warning: (232-248): Condition is always false.

23
test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol Normal file
View File

@ -0,0 +1,23 @@
pragma experimental SMTChecker;
contract C
{
bool b;
function g(bool _b) internal returns (bool) {
b = _b;
return b;
}
function f() public {
if (g(true) || (b == false)) {}
if ((b == true) || g(false)) {}
if (g(true) || g(false)) {}
if (g(true) || (b == false)) {}
if (g(false) || b) {}
}
}
// ----
// Warning: (156-179): Condition is always true.
// Warning: (190-213): Condition is always true.
// Warning: (224-243): Condition is always true.
// Warning: (254-277): Condition is always true.
// Warning: (288-301): Condition is always false.