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

Fix address literals not being treated as compile-time constants

Browse Source 
The early return implemented for address literals in TypeChecker was
preventing the isPure annotation from getting applied. Closes #2441
This commit is contained in:
Federico Bond 2017-06-22 10:59:00 -03:00 committed by chriseth
parent b86a4cad57
commit 0fb1621a98
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -13,6 +13,7 @@ Features:
* Code Generator: Added the Whiskers template system. * Code Generator: Added the Whiskers template system.
Bugfixes: Bugfixes:
* Type Checker: Fix address literals not being treated as compile-time constants.
* Type Checker: Make UTF8-validation a bit more sloppy to include more valid sequences. * Type Checker: Make UTF8-validation a bit more sloppy to include more valid sequences.
* Fixed crash concerning non-callable types. * Fixed crash concerning non-callable types.
* Unused variable warnings no longer issued for variables used inside inline assembly. * Unused variable warnings no longer issued for variables used inside inline assembly.

10
libsolidity/analysis/TypeChecker.cpp
View File

@ -1726,10 +1726,7 @@ void TypeChecker::endVisit(Literal const& _literal)
if (_literal.looksLikeAddress()) if (_literal.looksLikeAddress())
{ {
if (_literal.passesAddressChecksum()) if (_literal.passesAddressChecksum())
{
_literal.annotation().type = make_shared<IntegerType>(0, IntegerType::Modifier::Address); _literal.annotation().type = make_shared<IntegerType>(0, IntegerType::Modifier::Address);
return;
}
else else
m_errorReporter.warning( m_errorReporter.warning(
_literal.location(), _literal.location(),
@ -1737,10 +1734,13 @@ void TypeChecker::endVisit(Literal const& _literal)
"If this is not used as an address, please prepend '00'." "If this is not used as an address, please prepend '00'."
); );
} }
_literal.annotation().type = Type::forLiteral(_literal); if (!_literal.annotation().type)
_literal.annotation().isPure = true; _literal.annotation().type = Type::forLiteral(_literal);
if (!_literal.annotation().type) if (!_literal.annotation().type)
m_errorReporter.fatalTypeError(_literal.location(), "Invalid literal value."); m_errorReporter.fatalTypeError(_literal.location(), "Invalid literal value.");
_literal.annotation().isPure = true;
} }
bool TypeChecker::contractDependenciesAreCyclic( bool TypeChecker::contractDependenciesAreCyclic(