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

Merge pull request #9690 from ethereum/immutable-rhs-vardecl

Browse Source 
Disallow assigning more than once to immutables during the variable declaration
This commit is contained in:
chriseth 2020-08-28 14:39:23 +02:00 committed by GitHub
commit ec3f3c41dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -25,6 +25,7 @@ Bugfixes:
* Allow `type(Contract).name` for abstract contracts and interfaces. * Allow `type(Contract).name` for abstract contracts and interfaces.
* Type Checker: Disallow structs containing nested mapping in memory as parameters for library functions. * Type Checker: Disallow structs containing nested mapping in memory as parameters for library functions.
* Type Checker: Disallow ``using for`` directive inside interfaces. * Type Checker: Disallow ``using for`` directive inside interfaces.
* Immutables: Disallow assigning immutables more than once during their declaration.
### 0.7.0 (2020-07-28) ### 0.7.0 (2020-07-28)

8
libsolidity/analysis/ImmutableValidator.cpp
View File

@ -34,10 +34,12 @@ void ImmutableValidator::analyze()
for (ContractDefinition const* contract: linearizedContracts) for (ContractDefinition const* contract: linearizedContracts)
for (VariableDeclaration const* stateVar: contract->stateVariables()) for (VariableDeclaration const* stateVar: contract->stateVariables())
if (stateVar->value()) if (stateVar->value())
{ m_initializedStateVariables.emplace(stateVar);
for (ContractDefinition const* contract: linearizedContracts)
for (VariableDeclaration const* stateVar: contract->stateVariables())
if (stateVar->value())
stateVar->value()->accept(*this); stateVar->value()->accept(*this);
solAssert(m_initializedStateVariables.emplace(stateVar).second, "");
}
for (ContractDefinition const* contract: linearizedContracts) for (ContractDefinition const* contract: linearizedContracts)
if (contract->constructor()) if (contract->constructor())

10
test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol Normal file
View File

@ -0,0 +1,10 @@
contract C {
uint immutable z = 2;
uint immutable x = z = y = 3;
uint immutable y = 5;
}
// ----
// TypeError 1581: (62-63): Immutable variables can only be initialized inline or assigned directly in the constructor.
// TypeError 1574: (62-63): Immutable state variable already initialized.
// TypeError 1581: (66-67): Immutable variables can only be initialized inline or assigned directly in the constructor.
// TypeError 1574: (66-67): Immutable state variable already initialized.

6
test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol Normal file
View File

@ -0,0 +1,6 @@
contract C {
int immutable x = x = 5;
}
// ----
// TypeError 1581: (35-36): Immutable variables can only be initialized inline or assigned directly in the constructor.
// TypeError 1574: (35-36): Immutable state variable already initialized.