From a680cbd47411c20b8bda59b535fc138974e72f0d Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 19 Feb 2018 19:21:16 +0100 Subject: Test ``_offset`` for constants in inline assembly. --- test/libsolidity/SolidityNameAndTypeResolution.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 2b102312..7c03d7cb 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -5776,6 +5776,21 @@ BOOST_AUTO_TEST_CASE(inline_assembly_storage_variable_access_out_of_functions) CHECK_SUCCESS_NO_WARNINGS(text); } +BOOST_AUTO_TEST_CASE(inline_assembly_constant_variable_via_offset) +{ + char const* text = R"( + contract test { + uint constant x = 2; + function f() pure public { + assembly { + let r := x_offset + } + } + } + )"; + CHECK_ERROR(text, TypeError, "Constant variables not supported by inline assembly."); +} + BOOST_AUTO_TEST_CASE(inline_assembly_calldata_variables) { char const* text = R"( -- cgit v1.2.3 From 930485cd244cc32fd499dc3d59f1220b972c9da1 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 19 Feb 2018 19:21:33 +0100 Subject: Properly warn about the use of constants in inline assembly in connection with ``_offset`` and ``_slot``. --- libsolidity/analysis/TypeChecker.cpp | 12 ++++++------ 1 file 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(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."); -- cgit v1.2.3 From 83692360b1a3213fbe8a65b08b892980312b7ac1 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 19 Feb 2018 19:21:58 +0100 Subject: Changelog entry. --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index de0b742e..d6b83d6e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ Features: Bugfixes: * JSON-AST: Add "documentation" property to function, event and modifier definition. * Standard JSON: catch errors properly when invalid "sources" are passed + * Type Checker: Properly warn when using ``_offset`` and ``_slot`` for constants in inline assembly. ### 0.4.20 (2018-02-14) -- cgit v1.2.3