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

Merge pull request #4213 from ethereum/fixpop

Browse Source 
Fix bug related to byte array pop.
This commit is contained in:
chriseth 2018-06-04 16:10:56 +02:00 committed by GitHub
commit c59a06bb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/ast/Types.cpp
View File

@ -2529,6 +2529,7 @@ string FunctionType::richIdentifier() const
case Kind::AddMod: id += "addmod"; break; case Kind::AddMod: id += "addmod"; break;
case Kind::MulMod: id += "mulmod"; break; case Kind::MulMod: id += "mulmod"; break;
case Kind::ArrayPush: id += "arraypush"; break; case Kind::ArrayPush: id += "arraypush"; break;
case Kind::ArrayPop: id += "arraypop"; break;
case Kind::ByteArrayPush: id += "bytearraypush"; break; case Kind::ByteArrayPush: id += "bytearraypush"; break;
case Kind::ObjectCreation: id += "objectcreation"; break; case Kind::ObjectCreation: id += "objectcreation"; break;
case Kind::Assert: id += "assert"; break; case Kind::Assert: id += "assert"; break;
@ -2683,6 +2684,7 @@ unsigned FunctionType::sizeOnStack() const
case Kind::BareDelegateCall: case Kind::BareDelegateCall:
case Kind::Internal: case Kind::Internal:
case Kind::ArrayPush: case Kind::ArrayPush:
case Kind::ArrayPop:
case Kind::ByteArrayPush: case Kind::ByteArrayPush:
size = 1; size = 1;
break; break;

34
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -5397,6 +5397,40 @@ BOOST_AUTO_TEST_CASE(byte_array_pop_copy_long)
)); ));
} }
BOOST_AUTO_TEST_CASE(array_pop_isolated)
{
char const* sourceCode = R"(
// This tests that the compiler knows the correct size of the function on the stack.
contract c {
uint[] data;
function test() public returns (uint x) {
x = 2;
data.pop;
x = 3;
}
}
)";
compileAndRun(sourceCode);
ABI_CHECK(callContractFunction("test()"), encodeArgs(3));
}
BOOST_AUTO_TEST_CASE(byte_array_pop_isolated)
{
char const* sourceCode = R"(
// This tests that the compiler knows the correct size of the function on the stack.
contract c {
bytes data;
function test() public returns (uint x) {
x = 2;
data.pop;
x = 3;
}
}
)";
compileAndRun(sourceCode);
ABI_CHECK(callContractFunction("test()"), encodeArgs(3));
}
BOOST_AUTO_TEST_CASE(external_array_args) BOOST_AUTO_TEST_CASE(external_array_args)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(