mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #4213 from ethereum/fixpop
Fix bug related to byte array pop.
This commit is contained in:
commit
c59a06bb97
@ -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;
|
||||||
|
@ -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"(
|
||||||
|
Loading…
Reference in New Issue
Block a user