diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-02 03:53:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 03:53:56 +0800 |
| commit | a78565e44fbcb1d2e3244a6100c0da464ca73c19 (patch) | |
| tree | d00c6b384cc87ae82a46ee2b71e9045502854a99 /libsolidity/analysis/DeclarationContainer.cpp | |
| parent | 1f832e068b2d2c79fff870742d867b655b62f691 (diff) | |
| parent | ce7c7aca798bd11f51e23ef0ff104405d09fb220 (diff) | |
| download | dexon-solidity-a78565e44fbcb1d2e3244a6100c0da464ca73c19.tar dexon-solidity-a78565e44fbcb1d2e3244a6100c0da464ca73c19.tar.gz dexon-solidity-a78565e44fbcb1d2e3244a6100c0da464ca73c19.tar.bz2 dexon-solidity-a78565e44fbcb1d2e3244a6100c0da464ca73c19.tar.lz dexon-solidity-a78565e44fbcb1d2e3244a6100c0da464ca73c19.tar.xz dexon-solidity-a78565e44fbcb1d2e3244a6100c0da464ca73c19.tar.zst dexon-solidity-a78565e44fbcb1d2e3244a6100c0da464ca73c19.zip | |
Merge pull request #4508 from ethereum/nameCollisionCrash
[BREAKING] Don't exclude public state variables when looking for conflicting declarations.
Diffstat (limited to 'libsolidity/analysis/DeclarationContainer.cpp')
| -rw-r--r-- | libsolidity/analysis/DeclarationContainer.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp index 9e2bf6d3..347daaf8 100644 --- a/libsolidity/analysis/DeclarationContainer.cpp +++ b/libsolidity/analysis/DeclarationContainer.cpp @@ -49,16 +49,10 @@ Declaration const* DeclarationContainer::conflictingDeclaration( dynamic_cast<MagicVariableDeclaration const*>(&_declaration) ) { - // check that all other declarations with the same name are functions or a public state variable or events. - // And then check that the signatures are different. + // check that all other declarations are of the same kind (in which + // case the type checker will ensure that the signatures are different) for (Declaration const* declaration: declarations) { - if (auto variableDeclaration = dynamic_cast<VariableDeclaration const*>(declaration)) - { - if (variableDeclaration->isStateVariable() && !variableDeclaration->isConstant() && variableDeclaration->isPublic()) - continue; - return declaration; - } if ( dynamic_cast<FunctionDefinition const*>(&_declaration) && !dynamic_cast<FunctionDefinition const*>(declaration) |