cerc-io/solidity
10
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

Make tests comply with stack height checks.

Browse Source
This commit is contained in:
chriseth 2017-03-22 13:21:41 +01:00
parent c4a0826f40
commit f13c8af3f9
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
test/libsolidity/InlineAssembly.cpp
View File

@ -137,22 +137,22 @@ BOOST_AUTO_TEST_CASE(smoke_test)
BOOST_AUTO_TEST_CASE(simple_instructions) BOOST_AUTO_TEST_CASE(simple_instructions)
{ {
BOOST_CHECK(successParse("{ dup1 dup1 mul dup1 sub }")); BOOST_CHECK(successParse("{ dup1 dup1 mul dup1 sub pop }"));
} }
BOOST_AUTO_TEST_CASE(suicide_selfdestruct) BOOST_AUTO_TEST_CASE(suicide_selfdestruct)
{ {
BOOST_CHECK(successParse("{ suicide selfdestruct }")); BOOST_CHECK(successParse("{ 0x01 suicide 0x02 selfdestruct }"));
} }
BOOST_AUTO_TEST_CASE(keywords) BOOST_AUTO_TEST_CASE(keywords)
{ {
BOOST_CHECK(successParse("{ byte return address }")); BOOST_CHECK(successParse("{ 1 2 byte 2 return address pop }"));
} }
BOOST_AUTO_TEST_CASE(constants) BOOST_AUTO_TEST_CASE(constants)
{ {
BOOST_CHECK(successParse("{ 7 8 mul }")); BOOST_CHECK(successParse("{ 7 8 mul pop }"));
} }
BOOST_AUTO_TEST_CASE(vardecl) BOOST_AUTO_TEST_CASE(vardecl)
@ -167,17 +167,17 @@ BOOST_AUTO_TEST_CASE(assignment)
BOOST_AUTO_TEST_CASE(label) BOOST_AUTO_TEST_CASE(label)
{ {
BOOST_CHECK(successParse("{ 7 abc: 8 eq abc jump }")); BOOST_CHECK(successParse("{ 7 abc: 8 eq abc jump pop }"));
} }
BOOST_AUTO_TEST_CASE(label_complex) BOOST_AUTO_TEST_CASE(label_complex)
{ {
BOOST_CHECK(successParse("{ 7 abc: 8 eq jump(abc) jumpi(eq(7, 8), abc) }")); BOOST_CHECK(successParse("{ 7 abc: 8 eq jump(abc) jumpi(eq(7, 8), abc) pop }"));
} }
BOOST_AUTO_TEST_CASE(functional) BOOST_AUTO_TEST_CASE(functional)
{ {
BOOST_CHECK(successParse("{ let x := 2 add(7, mul(6, x)) mul(7, 8) add }")); BOOST_CHECK(successParse("{ let x := 2 add(7, mul(6, x)) mul(7, 8) add =: x }"));
} }
BOOST_AUTO_TEST_CASE(functional_assignment) BOOST_AUTO_TEST_CASE(functional_assignment)
@ -218,7 +218,7 @@ BOOST_AUTO_TEST_CASE(function_definitions_multiple_args)
BOOST_AUTO_TEST_CASE(function_calls) BOOST_AUTO_TEST_CASE(function_calls)
{ {
BOOST_CHECK(successParse("{ function f(a) {} function g(a, b, c) {} function x() { g(1, 2, f(mul(2, 3))) x() } }")); BOOST_CHECK(successParse("{ function f(a) -> (b) {} function g(a, b, c) {} function x() { g(1, 2, f(mul(2, 3))) x() } }"));
} }
BOOST_AUTO_TEST_CASE(opcode_for_functions) BOOST_AUTO_TEST_CASE(opcode_for_functions)
@ -239,7 +239,7 @@ BOOST_AUTO_TEST_CASE(name_clashes)
BOOST_AUTO_TEST_CASE(variable_access_cross_functions) BOOST_AUTO_TEST_CASE(variable_access_cross_functions)
{ {
CHECK_PARSE_ERROR("{ let x := 2 function g() { x } }", DeclarationError, "Identifier not found."); CHECK_PARSE_ERROR("{ let x := 2 function g() { x pop } }", DeclarationError, "Identifier not found.");
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE(print_smoke)
BOOST_AUTO_TEST_CASE(print_instructions) BOOST_AUTO_TEST_CASE(print_instructions)
{ {
parsePrintCompare("{\n 7\n 8\n mul\n dup10\n add\n}"); parsePrintCompare("{\n 7\n 8\n mul\n dup10\n add\n pop\n}");
} }
BOOST_AUTO_TEST_CASE(print_subblock) BOOST_AUTO_TEST_CASE(print_subblock)
@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE(print_subblock)
BOOST_AUTO_TEST_CASE(print_functional) BOOST_AUTO_TEST_CASE(print_functional)
{ {
parsePrintCompare("{\n mul(sload(0x12), 7)\n}"); parsePrintCompare("{\n let x := mul(sload(0x12), 7)\n}");
} }
BOOST_AUTO_TEST_CASE(print_label) BOOST_AUTO_TEST_CASE(print_label)
@ -278,13 +278,13 @@ BOOST_AUTO_TEST_CASE(print_assignments)
BOOST_AUTO_TEST_CASE(print_string_literals) BOOST_AUTO_TEST_CASE(print_string_literals)
{ {
parsePrintCompare("{\n \"\\n'\\xab\\x95\\\"\"\n}"); parsePrintCompare("{\n \"\\n'\\xab\\x95\\\"\"\n pop\n}");
} }
BOOST_AUTO_TEST_CASE(print_string_literal_unicode) BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
{ {
string source = "{ \"\\u1bac\" }"; string source = "{ let x := \"\\u1bac\" }";
string parsed = "{\n \"\\xe1\\xae\\xac\"\n}"; string parsed = "{\n let x := \"\\xe1\\xae\\xac\"\n}";
assembly::InlineAssemblyStack stack; assembly::InlineAssemblyStack stack;
BOOST_REQUIRE(stack.parse(std::make_shared<Scanner>(CharStream(source)))); BOOST_REQUIRE(stack.parse(std::make_shared<Scanner>(CharStream(source))));
BOOST_REQUIRE(stack.errors().empty()); BOOST_REQUIRE(stack.errors().empty());
@ -300,7 +300,7 @@ BOOST_AUTO_TEST_CASE(function_definitions_multiple_args)
BOOST_AUTO_TEST_CASE(function_calls) BOOST_AUTO_TEST_CASE(function_calls)
{ {
parsePrintCompare( parsePrintCompare(
"{\n function y()\n {\n }\n function f(a)\n {\n }\n function g(a, b, c)\n {\n }\n g(1, mul(2, address), f(mul(2, caller)))\n y()\n}" "{\n function y()\n {\n }\n function f(a) -> (b)\n {\n }\n function g(a, b, c)\n {\n }\n g(1, mul(2, address), f(mul(2, caller)))\n y()\n}"
); );
} }
@ -320,27 +320,27 @@ BOOST_AUTO_TEST_CASE(oversize_string_literals)
BOOST_AUTO_TEST_CASE(assignment_after_tag) BOOST_AUTO_TEST_CASE(assignment_after_tag)
{ {
BOOST_CHECK(successParse("{ let x := 1 { tag: =: x } }")); BOOST_CHECK(successParse("{ let x := 1 { 7 tag: =: x } }"));
} }
BOOST_AUTO_TEST_CASE(magic_variables) BOOST_AUTO_TEST_CASE(magic_variables)
{ {
CHECK_ASSEMBLE_ERROR("{ this pop }", DeclarationError, "Identifier not found"); CHECK_ASSEMBLE_ERROR("{ this pop }", DeclarationError, "Identifier not found");
CHECK_ASSEMBLE_ERROR("{ ecrecover pop }", DeclarationError, "Identifier not found"); CHECK_ASSEMBLE_ERROR("{ ecrecover pop }", DeclarationError, "Identifier not found");
BOOST_CHECK(successAssemble("{ let ecrecover := 1 ecrecover }")); BOOST_CHECK(successAssemble("{ let ecrecover := 1 ecrecover pop }"));
} }
BOOST_AUTO_TEST_CASE(imbalanced_stack) BOOST_AUTO_TEST_CASE(imbalanced_stack)
{ {
BOOST_CHECK(successAssemble("{ 1 2 mul pop }", false)); BOOST_CHECK(successAssemble("{ 1 2 mul pop }", false));
CHECK_ASSEMBLE_ERROR("{ 1 }", Warning, "Inline assembly block is not balanced. It leaves"); CHECK_ASSEMBLE_ERROR("{ 1 }", DeclarationError, "Unbalanced stack at the end of a block: 1 surplus item(s).");
CHECK_ASSEMBLE_ERROR("{ pop }", Warning, "Inline assembly block is not balanced. It takes"); CHECK_ASSEMBLE_ERROR("{ pop }", DeclarationError, "Unbalanced stack at the end of a block: 1 missing item(s).");
BOOST_CHECK(successAssemble("{ let x := 4 7 add }", false)); BOOST_CHECK(successAssemble("{ let x := 4 7 add }", false));
} }
BOOST_AUTO_TEST_CASE(error_tag) BOOST_AUTO_TEST_CASE(error_tag)
{ {
BOOST_CHECK(successAssemble("{ invalidJumpLabel }")); BOOST_CHECK(successAssemble("{ jump(invalidJumpLabel) }"));
} }
BOOST_AUTO_TEST_CASE(designated_invalid_instruction) BOOST_AUTO_TEST_CASE(designated_invalid_instruction)

1
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -7474,6 +7474,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_function_access)
assembly { assembly {
_x _x
jump(g) jump(g)
pop
} }
} }
} }

12
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -4997,7 +4997,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_positive_stack)
} }
} }
)"; )";
CHECK_WARNING(text, "Inline assembly block is not balanced"); CHECK_ERROR(text, DeclarationError, "Unbalanced stack at the end of a block: 1 surplus item(s).");
} }
BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_negative_stack) BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_negative_stack)
@ -5011,7 +5011,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_negative_stack)
} }
} }
)"; )";
CHECK_WARNING(text, "Inline assembly block is not balanced"); CHECK_ERROR(text, DeclarationError, "Unbalanced stack at the end of a block: 1 missing item(s).");
} }
BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_two_stack_load) BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_two_stack_load)
@ -5024,7 +5024,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_two_stack_load)
} }
} }
)"; )";
CHECK_WARNING(text, "Inline assembly block is not balanced"); CHECK_ERROR(text, DeclarationError, "Unbalanced stack at the end of a block: 1 surplus item(s).");
} }
BOOST_AUTO_TEST_CASE(inline_assembly_in_modifier) BOOST_AUTO_TEST_CASE(inline_assembly_in_modifier)
@ -5053,12 +5053,11 @@ BOOST_AUTO_TEST_CASE(inline_assembly_storage)
function f() { function f() {
assembly { assembly {
x := 2 x := 2
pop
} }
} }
} }
)"; )";
CHECK_ERROR(text, DeclarationError, "Variable not found."); CHECK_ERROR(text, DeclarationError, "Variable not found or variable not lvalue.");
} }
BOOST_AUTO_TEST_CASE(inline_assembly_storage_in_modifiers) BOOST_AUTO_TEST_CASE(inline_assembly_storage_in_modifiers)
@ -5069,7 +5068,6 @@ BOOST_AUTO_TEST_CASE(inline_assembly_storage_in_modifiers)
modifier m { modifier m {
assembly { assembly {
x := 2 x := 2
pop
} }
_; _;
} }
@ -5077,7 +5075,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_storage_in_modifiers)
} }
} }
)"; )";
CHECK_ERROR(text, DeclarationError, ""); CHECK_ERROR(text, DeclarationError, "Variable not found or variable not lvalue.");
} }
BOOST_AUTO_TEST_CASE(invalid_mobile_type) BOOST_AUTO_TEST_CASE(invalid_mobile_type)