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

Ensure that bound functions cannot be defined without self type

Browse Source
This commit is contained in:
Alex Beregszaszi 2016-10-14 19:30:04 +01:00
parent 8317eb0383
commit 003359a0b6
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -8,6 +8,7 @@ Features:
Bugfixes: Bugfixes:
* Disallow unknown options in `solc` * Disallow unknown options in `solc`
* Proper type checking for bound functions.
* Code Generator: expect zero stack increase after `super` as an expression * Code Generator: expect zero stack increase after `super` as an expression
* Inline assembly: support the `address` opcode * Inline assembly: support the `address` opcode
* Inline assembly: fix parsing of assignment after a label. * Inline assembly: fix parsing of assignment after a label.

3
libsolidity/ast/Types.cpp
View File

@ -2069,6 +2069,9 @@ TypePointer FunctionType::copyAndSetGasOrValue(bool _setGas, bool _setValue) con
FunctionTypePointer FunctionType::asMemberFunction(bool _inLibrary, bool _bound) const FunctionTypePointer FunctionType::asMemberFunction(bool _inLibrary, bool _bound) const
{ {
if (_bound && m_parameterTypes.empty())
return FunctionTypePointer();
TypePointers parameterTypes; TypePointers parameterTypes;
for (auto const& t: m_parameterTypes) for (auto const& t: m_parameterTypes)
{ {

10
libsolidity/ast/Types.h
View File

@ -872,7 +872,12 @@ public:
m_isConstant(_isConstant), m_isConstant(_isConstant),
m_isPayable(_isPayable), m_isPayable(_isPayable),
m_declaration(_declaration) m_declaration(_declaration)
{} {
solAssert(
!m_bound || !m_parameterTypes.empty(),
"Attempted construction of bound function without self type"
);
}
TypePointers parameterTypes() const; TypePointers parameterTypes() const;
std::vector<std::string> parameterNames() 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. /// 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 /// This is needed if external functions are called on other contracts, as they cannot return
/// dynamic values. /// 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 _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; FunctionTypePointer asMemberFunction(bool _inLibrary, bool _bound = false) const;
private: private: