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

[SMTChecker] Fix ICE when inlining function with tuple expression

Browse Source
This commit is contained in:
Leonardo Alt 2019-07-26 16:28:19 +02:00
parent 4f7fec6911
commit 847f574e22
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -18,6 +18,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* SMTChecker: Fix internal error when inlining functions that contain tuple expressions.
* View/Pure Checker: Properly detect state variable access through base class. * View/Pure Checker: Properly detect state variable access through base class.
* Yul analyzer: Check availability of data objects already in analysis phase. * Yul analyzer: Check availability of data objects already in analysis phase.
* Yul Optimizer: Fix an issue where memory-accessing code was removed even though ``msize`` was used in the program. * Yul Optimizer: Fix an issue where memory-accessing code was removed even though ``msize`` was used in the program.

7
libsolidity/formal/SMTEncoder.cpp
View File

@ -265,6 +265,10 @@ void SMTEncoder::endVisit(TupleExpression const& _tuple)
"Assertion checker does not yet implement inline arrays." "Assertion checker does not yet implement inline arrays."
); );
else if (_tuple.annotation().type->category() == Type::Category::Tuple) else if (_tuple.annotation().type->category() == Type::Category::Tuple)
{
auto const& symbTuple = dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_tuple));
solAssert(symbTuple, "");
if (symbTuple->components().empty())
{ {
vector<shared_ptr<smt::SymbolicVariable>> components; vector<shared_ptr<smt::SymbolicVariable>> components;
for (auto const& component: _tuple.components()) for (auto const& component: _tuple.components())
@ -281,10 +285,9 @@ void SMTEncoder::endVisit(TupleExpression const& _tuple)
else else
components.push_back(nullptr); components.push_back(nullptr);
solAssert(components.size() == _tuple.components().size(), ""); solAssert(components.size() == _tuple.components().size(), "");
auto const& symbTuple = dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_tuple));
solAssert(symbTuple, "");
symbTuple->setComponents(move(components)); symbTuple->setComponents(move(components));
} }
}
else else
{ {
/// Parenthesized expressions are also TupleExpression regardless their type. /// Parenthesized expressions are also TupleExpression regardless their type.

14
test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol Normal file
View File

@ -0,0 +1,14 @@
pragma experimental SMTChecker;
contract C
{
function f(uint x) public pure returns (uint, uint) {
return (x, x);
}
function g() public pure {
(uint a, uint b) = f(0);
(uint c, uint d) = f(0);
assert(a == c && b == d);
}
}