diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-02-15 20:05:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 20:05:21 +0800 |
| commit | 5746e2d7d867440780ced524dd7e7c29149cf3e2 (patch) | |
| tree | 02f328d8b013970fde8860f68725cc19eb4820e5 | |
| parent | 834dac79895811cde1e41d8b4de5d4ef6d758303 (diff) | |
| parent | e08a20607049175e241654efec90371d2693931c (diff) | |
| download | dexon-solidity-5746e2d7d867440780ced524dd7e7c29149cf3e2.tar dexon-solidity-5746e2d7d867440780ced524dd7e7c29149cf3e2.tar.gz dexon-solidity-5746e2d7d867440780ced524dd7e7c29149cf3e2.tar.bz2 dexon-solidity-5746e2d7d867440780ced524dd7e7c29149cf3e2.tar.lz dexon-solidity-5746e2d7d867440780ced524dd7e7c29149cf3e2.tar.xz dexon-solidity-5746e2d7d867440780ced524dd7e7c29149cf3e2.tar.zst dexon-solidity-5746e2d7d867440780ced524dd7e7c29149cf3e2.zip | |
Merge pull request #3521 from ethereum/uninitializedStoragePointers
Disallow uninitialized storage pointers as experimental 0.5.0 feature.
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 6 | ||||
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 32 |
3 files changed, 38 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md index ade9ac86..58604ca2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ ### 0.4.21 (unreleased) Features: + * Type Checker: Disallow uninitialized storage pointers as experimental 0.5.0 feature. Bugfixes: diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index d67142e4..f62ddeb9 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -972,7 +972,11 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement) string errorText{"Uninitialized storage pointer."}; if (varDecl.referenceLocation() == VariableDeclaration::Location::Default) errorText += " Did you mean '<type> memory " + varDecl.name() + "'?"; - m_errorReporter.warning(varDecl.location(), errorText); + solAssert(m_scope, ""); + if (m_scope->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050)) + m_errorReporter.declarationError(varDecl.location(), errorText); + else + m_errorReporter.warning(varDecl.location(), errorText); } } else if (dynamic_cast<MappingType const*>(type(varDecl).get())) diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 315c7c5f..2b102312 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -3021,6 +3021,20 @@ BOOST_AUTO_TEST_CASE(uninitialized_mapping_array_variable) CHECK_WARNING(sourceCode, "Uninitialized storage pointer"); } +BOOST_AUTO_TEST_CASE(uninitialized_mapping_array_variable_050) +{ + char const* sourceCode = R"( + pragma experimental "v0.5.0"; + contract C { + function f() pure public { + mapping(uint => uint)[] storage x; + x; + } + } + )"; + CHECK_ERROR(sourceCode, DeclarationError, "Uninitialized storage pointer"); +} + BOOST_AUTO_TEST_CASE(no_delete_on_storage_pointers) { char const* sourceCode = R"( @@ -3320,6 +3334,24 @@ BOOST_AUTO_TEST_CASE(non_initialized_references) CHECK_WARNING(text, "Uninitialized storage pointer"); } +BOOST_AUTO_TEST_CASE(non_initialized_references_050) +{ + char const* text = R"( + pragma experimental "v0.5.0"; + contract c + { + struct s { + uint a; + } + function f() public { + s storage x; + } + } + )"; + + CHECK_ERROR(text, DeclarationError, "Uninitialized storage pointer"); +} + BOOST_AUTO_TEST_CASE(keccak256_with_large_integer_constant) { char const* text = R"( |