diff options
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 2 | ||||
| -rw-r--r-- | test/libsolidity/InlineAssembly.cpp | 6 | ||||
| -rw-r--r-- | test/libsolidity/SolidityParser.cpp | 14 |
3 files changed, 7 insertions, 15 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index c0efb651..cd3ea0da 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -215,7 +215,7 @@ assembly::VariableDeclaration Parser::parseVariableDeclaration() expectToken(Token::Let); varDecl.name = m_scanner->currentLiteral(); if (s_instructions.count(varDecl.name)) - fatalParserError("Cannot shadow instructions with variable declaration."); + fatalParserError("Cannot use instruction names for identifier names."); expectToken(Token::Identifier); expectToken(Token::Colon); expectToken(Token::Assign); diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp index 64073edc..c2dac287 100644 --- a/test/libsolidity/InlineAssembly.cpp +++ b/test/libsolidity/InlineAssembly.cpp @@ -182,6 +182,12 @@ BOOST_AUTO_TEST_CASE(error_tag) BOOST_CHECK(successAssemble("{ invalidJumpLabel }")); } +BOOST_AUTO_TEST_CASE(inline_assembly_shadowed_instruction) +{ + // Error message: "Cannot use instruction names for identifier names." + BOOST_CHECK(!successAssemble("{ let gas := 1 }")); +} + BOOST_AUTO_TEST_SUITE_END() } diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index 22766358..e5362e78 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -1479,20 +1479,6 @@ BOOST_AUTO_TEST_CASE(function_type_state_variable) BOOST_CHECK(successParse(text)); } -BOOST_AUTO_TEST_CASE(inline_assembly_shadowed_instruction) -{ - char const* text = R"( - contract A { - function f() { - assembly { - let gas := 1 - } - } - } - )"; - CHECK_PARSE_ERROR(text, "Cannot shadow instructions with variable declaration."); -} - BOOST_AUTO_TEST_SUITE_END() } |