diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-02-20 18:17:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 18:17:58 +0800 |
| commit | a6b52fdc34650c74597c1bcdc5075b6375c62650 (patch) | |
| tree | 93a9f3fe5139033e4c858adccaa635db1ed73a76 /libsolidity | |
| parent | 2a58b44b8bdb802747ea6b908350cfb61dc75bb9 (diff) | |
| parent | 83692360b1a3213fbe8a65b08b892980312b7ac1 (diff) | |
| download | dexon-solidity-a6b52fdc34650c74597c1bcdc5075b6375c62650.tar.gz dexon-solidity-a6b52fdc34650c74597c1bcdc5075b6375c62650.tar.zst dexon-solidity-a6b52fdc34650c74597c1bcdc5075b6375c62650.zip | |
Merge pull request #3550 from ethereum/offsetconstantsasm
Properly warn when using ``_offset`` and ``_slot`` for constants in inline assembly.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index f62ddeb9..0ee16c89 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -804,7 +804,12 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) solAssert(!!declaration, ""); if (auto var = dynamic_cast<VariableDeclaration const*>(declaration)) { - if (ref->second.isSlot || ref->second.isOffset) + if (var->isConstant()) + { + m_errorReporter.typeError(_identifier.location, "Constant variables not supported by inline assembly."); + return size_t(-1); + } + else if (ref->second.isSlot || ref->second.isOffset) { if (!var->isStateVariable() && !var->type()->dataStoredIn(DataLocation::Storage)) { @@ -817,11 +822,6 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) return size_t(-1); } } - else if (var->isConstant()) - { - m_errorReporter.typeError(_identifier.location, "Constant variables not supported by inline assembly."); - return size_t(-1); - } else if (!var->isLocalVariable()) { m_errorReporter.typeError(_identifier.location, "Only local variables are supported. To access storage variables, use the _slot and _offset suffixes."); |