cerc-io/solidity
10
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

Disallow public state variables overriding pure functions.

Browse Source
This commit is contained in:
chriseth 2020-07-14 20:11:01 +02:00 committed by Mathias Baumann
parent 69a596b0ff
commit d3647b13e4
4 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -29,6 +29,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* NatSpec: Constructors and functions have consistent userdoc output. * NatSpec: Constructors and functions have consistent userdoc output.
* Inheritance: Disallow public state variables overwriting ``pure`` functions.
### 0.6.12 (unreleased) ### 0.6.12 (unreleased)

2
docs/contracts/inheritance.rst
View File

@ -310,7 +310,7 @@ of the variable:
contract A contract A
{ {
function f() external pure virtual returns(uint) { return 5; } function f() external view virtual returns(uint) { return 5; }
} }
contract B is A contract B is A

12
libsolidity/analysis/OverrideChecker.cpp
View File

@ -584,11 +584,10 @@ void OverrideChecker::checkOverride(OverrideProxy const& _overriding, OverridePr
"Overridden " + _overriding.astNodeName() + " is here:" "Overridden " + _overriding.astNodeName() + " is here:"
); );
// This is only relevant for a function overriding a function.
if (_overriding.isFunction())
{
// Stricter mutability is always okay except when super is Payable // Stricter mutability is always okay except when super is Payable
if (( if (
(_overriding.isFunction() || _overriding.isVariable()) &&
(
_overriding.stateMutability() > _super.stateMutability() || _overriding.stateMutability() > _super.stateMutability() ||
_super.stateMutability() == StateMutability::Payable _super.stateMutability() == StateMutability::Payable
) && ) &&
@ -598,7 +597,9 @@ void OverrideChecker::checkOverride(OverrideProxy const& _overriding, OverridePr
_overriding, _overriding,
_super, _super,
6959_error, 6959_error,
"Overriding function changes state mutability from \"" + "Overriding " +
_overriding.astNodeName() +
" changes state mutability from \"" +
stateMutabilityToString(_super.stateMutability()) + stateMutabilityToString(_super.stateMutability()) +
"\" to \"" + "\" to \"" +
stateMutabilityToString(_overriding.stateMutability()) + stateMutabilityToString(_overriding.stateMutability()) +
@ -614,7 +615,6 @@ void OverrideChecker::checkOverride(OverrideProxy const& _overriding, OverridePr
); );
} }
} }
}
void OverrideChecker::overrideListError( void OverrideChecker::overrideListError(
OverrideProxy const& _item, OverrideProxy const& _item,

8
test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol Normal file
View File

@ -0,0 +1,8 @@
abstract contract C {
function foo() external pure virtual returns (uint);
}
contract X is C {
uint public override foo;
}
// ----
// TypeError 6959: (100-124): Overriding public state variable changes state mutability from "pure" to "view".