diff options
| author | chriseth <chris@ethereum.org> | 2016-10-19 20:44:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 20:44:09 +0800 |
| commit | 4f191d1f6fbdf9b424c4292db0ec10f5040a0b09 (patch) | |
| tree | 4a35828ea3554c3cfa9dd616581dab9439551082 /libsolidity | |
| parent | f9e92b37ba6d71991979f3d6782287980df6b026 (diff) | |
| parent | fdd1108c1c2e316d143f44d048f1686be2e2eb3a (diff) | |
| download | dexon-solidity-4f191d1f6fbdf9b424c4292db0ec10f5040a0b09.tar.gz dexon-solidity-4f191d1f6fbdf9b424c4292db0ec10f5040a0b09.tar.zst dexon-solidity-4f191d1f6fbdf9b424c4292db0ec10f5040a0b09.zip | |
Merge pull request #1194 from ethereum/bound-functions
Proper type checking for bound functions
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/ast/Types.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/ast/Types.h | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index edb0fbe4..068cc138 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -241,7 +241,8 @@ MemberList::MemberMap Type::boundFunctions(Type const& _type, ContractDefinition seenFunctions.insert(function); FunctionType funType(*function, false); if (auto fun = funType.asMemberFunction(true, true)) - members.push_back(MemberList::Member(function->name(), fun, function)); + if (_type.isImplicitlyConvertibleTo(*fun->selfType())) + members.push_back(MemberList::Member(function->name(), fun, function)); } } return members; @@ -2069,6 +2070,9 @@ TypePointer FunctionType::copyAndSetGasOrValue(bool _setGas, bool _setValue) con FunctionTypePointer FunctionType::asMemberFunction(bool _inLibrary, bool _bound) const { + if (_bound && m_parameterTypes.empty()) + return FunctionTypePointer(); + TypePointers parameterTypes; for (auto const& t: m_parameterTypes) { diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index f65d25fb..3f94d11a 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -872,7 +872,12 @@ public: m_isConstant(_isConstant), m_isPayable(_isPayable), m_declaration(_declaration) - {} + { + solAssert( + !m_bound || !m_parameterTypes.empty(), + "Attempted construction of bound function without self type" + ); + } TypePointers parameterTypes() const; std::vector<std::string> parameterNames() const; @@ -940,8 +945,9 @@ public: /// removed and the location of reference types is changed from CallData to Memory. /// This is needed if external functions are called on other contracts, as they cannot return /// dynamic values. + /// Returns empty shared pointer on a failure. Namely, if a bound function has no parameters. /// @param _inLibrary if true, uses DelegateCall as location. - /// @param _bound if true, the argumenst are placed as `arg1.functionName(arg2, ..., argn)`. + /// @param _bound if true, the arguments are placed as `arg1.functionName(arg2, ..., argn)`. FunctionTypePointer asMemberFunction(bool _inLibrary, bool _bound = false) const; private: |