aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2018-11-19 22:53:26 +0800
committerGitHub <noreply@github.com>2018-11-19 22:53:26 +0800
commitd3f66ca0fab130e801b012bd192e1e8e97fb3761 (patch)
treeb671dcda3fca233f9213da5a217c83c6ddcf534e /libsolidity
parent5be45e736d2b111c9352ca2990a1c7a653c60c55 (diff)
parent06c3f0953ae9f9921683f80349c7b1bbddcb3a9f (diff)
downloaddexon-solidity-d3f66ca0fab130e801b012bd192e1e8e97fb3761.tar
dexon-solidity-d3f66ca0fab130e801b012bd192e1e8e97fb3761.tar.gz
dexon-solidity-d3f66ca0fab130e801b012bd192e1e8e97fb3761.tar.bz2
dexon-solidity-d3f66ca0fab130e801b012bd192e1e8e97fb3761.tar.lz
dexon-solidity-d3f66ca0fab130e801b012bd192e1e8e97fb3761.tar.xz
dexon-solidity-d3f66ca0fab130e801b012bd192e1e8e97fb3761.tar.zst
dexon-solidity-d3f66ca0fab130e801b012bd192e1e8e97fb3761.zip
Merge pull request #5309 from ethereum/smt_bound_functions
[SMTChecker] Support bound function calls
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/formal/SMTChecker.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/libsolidity/formal/SMTChecker.cpp b/libsolidity/formal/SMTChecker.cpp
index 9a2b9bbf..bbc78c0c 100644
--- a/libsolidity/formal/SMTChecker.cpp
+++ b/libsolidity/formal/SMTChecker.cpp
@@ -457,6 +457,14 @@ void SMTChecker::inlineFunctionCall(FunctionCall const& _funCall)
else if (_funDef && _funDef->isImplemented())
{
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())
funArgs.push_back(expr(*arg));
initializeFunctionCallParameters(*_funDef, funArgs);
@@ -548,6 +556,10 @@ void SMTChecker::endVisit(Return const& _return)
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;
solAssert(exprType, "");
if (exprType->category() == Type::Category::Magic)