cerc-io/solidity
16
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 #10542 from ethereum/fixConstantEv

Browse Source 
Fix bug in constant evaluator.
This commit is contained in:
Alex Beregszaszi 2020-12-09 16:04:42 +00:00 committed by GitHub
commit 32f1f16b8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/analysis/ConstantEvaluator.cpp
View File

@ -271,7 +271,8 @@ optional<TypedRational> ConstantEvaluator::evaluate(ASTNode const& _node)
if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(&_node)) if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(&_node))
{ {
solAssert(varDecl->isConstant(), ""); solAssert(varDecl->isConstant(), "");
if (!varDecl->value()) // In some circumstances, we do not yet have a type for the variable.
if (!varDecl->value() || !varDecl->type())
m_values[&_node] = nullopt; m_values[&_node] = nullopt;
else else
{ {

3
test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol Normal file
View File

@ -0,0 +1,3 @@
int[L] constant L = 6;
// ----
// TypeError 5462: (4-5): Invalid array length, expected integer literal or constant expression.

5
test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol Normal file
View File

@ -0,0 +1,5 @@
contract C {
int[L] constant L = 6;
}
// ----
// TypeError 5462: (21-22): Invalid array length, expected integer literal or constant expression.