mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
[SMTChecker] Support bound function calls
This commit is contained in:
parent
5be45e736d
commit
06c3f0953a
@ -8,6 +8,7 @@ Compiler Features:
|
|||||||
* Code generator: Do not perform redundant double cleanup on unsigned integers when loading from calldata.
|
* Code generator: Do not perform redundant double cleanup on unsigned integers when loading from calldata.
|
||||||
* SMTChecker: Support ``msg``, ``tx`` and ``block`` member variables.
|
* SMTChecker: Support ``msg``, ``tx`` and ``block`` member variables.
|
||||||
* SMTChecker: Support ``gasleft()`` and ``blockhash()`` functions.
|
* SMTChecker: Support ``gasleft()`` and ``blockhash()`` functions.
|
||||||
|
* SMTChecker: Support internal bound function calls.
|
||||||
|
|
||||||
|
|
||||||
Bugfixes:
|
Bugfixes:
|
||||||
|
@ -457,6 +457,14 @@ void SMTChecker::inlineFunctionCall(FunctionCall const& _funCall)
|
|||||||
else if (_funDef && _funDef->isImplemented())
|
else if (_funDef && _funDef->isImplemented())
|
||||||
{
|
{
|
||||||
vector<smt::Expression> funArgs;
|
vector<smt::Expression> funArgs;
|
||||||
|
auto const& funType = dynamic_cast<FunctionType const*>(_calledExpr->annotation().type.get());
|
||||||
|
solAssert(funType, "");
|
||||||
|
if (funType->bound())
|
||||||
|
{
|
||||||
|
auto const& boundFunction = dynamic_cast<MemberAccess const*>(_calledExpr);
|
||||||
|
solAssert(boundFunction, "");
|
||||||
|
funArgs.push_back(expr(boundFunction->expression()));
|
||||||
|
}
|
||||||
for (auto arg: _funCall.arguments())
|
for (auto arg: _funCall.arguments())
|
||||||
funArgs.push_back(expr(*arg));
|
funArgs.push_back(expr(*arg));
|
||||||
initializeFunctionCallParameters(*_funDef, funArgs);
|
initializeFunctionCallParameters(*_funDef, funArgs);
|
||||||
@ -548,6 +556,10 @@ void SMTChecker::endVisit(Return const& _return)
|
|||||||
|
|
||||||
bool SMTChecker::visit(MemberAccess const& _memberAccess)
|
bool SMTChecker::visit(MemberAccess const& _memberAccess)
|
||||||
{
|
{
|
||||||
|
auto const& accessType = _memberAccess.annotation().type;
|
||||||
|
if (accessType->category() == Type::Category::Function)
|
||||||
|
return true;
|
||||||
|
|
||||||
auto const& exprType = _memberAccess.expression().annotation().type;
|
auto const& exprType = _memberAccess.expression().annotation().type;
|
||||||
solAssert(exprType, "");
|
solAssert(exprType, "");
|
||||||
if (exprType->category() == Type::Category::Magic)
|
if (exprType->category() == Type::Category::Magic)
|
||||||
|
@ -0,0 +1,19 @@
|
|||||||
|
pragma experimental SMTChecker;
|
||||||
|
|
||||||
|
library L
|
||||||
|
{
|
||||||
|
function add(uint x, uint y) internal pure returns (uint) {
|
||||||
|
require(x < 1000);
|
||||||
|
require(y < 1000);
|
||||||
|
return x + y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
contract C
|
||||||
|
{
|
||||||
|
using L for uint;
|
||||||
|
function f(uint x) public pure {
|
||||||
|
uint y = x.add(999);
|
||||||
|
assert(y < 10000);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,21 @@
|
|||||||
|
pragma experimental SMTChecker;
|
||||||
|
|
||||||
|
library L
|
||||||
|
{
|
||||||
|
function add(uint x, uint y) internal pure returns (uint) {
|
||||||
|
require(x < 1000);
|
||||||
|
require(y < 1000);
|
||||||
|
return x + y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
contract C
|
||||||
|
{
|
||||||
|
using L for uint;
|
||||||
|
function f(uint x) public pure {
|
||||||
|
uint y = x.add(999);
|
||||||
|
assert(y < 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// ----
|
||||||
|
// Warning: (261-277): Assertion violation happens here
|
@ -0,0 +1,18 @@
|
|||||||
|
pragma experimental SMTChecker;
|
||||||
|
|
||||||
|
library L
|
||||||
|
{
|
||||||
|
function add(uint x, uint y) internal pure returns (uint) {
|
||||||
|
require(x < 1000);
|
||||||
|
require(y < 1000);
|
||||||
|
return x + y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
contract C
|
||||||
|
{
|
||||||
|
function f(uint x) public pure {
|
||||||
|
uint y = L.add(x, 999);
|
||||||
|
assert(y < 10000);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
pragma experimental SMTChecker;
|
||||||
|
|
||||||
|
library L
|
||||||
|
{
|
||||||
|
function add(uint x, uint y) internal pure returns (uint) {
|
||||||
|
require(x < 1000);
|
||||||
|
require(y < 1000);
|
||||||
|
return x + y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
contract C
|
||||||
|
{
|
||||||
|
function f(uint x) public pure {
|
||||||
|
uint y = L.add(x, 999);
|
||||||
|
assert(y < 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// ----
|
||||||
|
// Warning: (245-261): Assertion violation happens here
|
Loading…
Reference in New Issue
Block a user