mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #624 from chriseth/inaccessibleDynType
Inaccessible dynamic types
This commit is contained in:
@@ -6793,6 +6793,51 @@ BOOST_AUTO_TEST_CASE(cleanup_bytes_types)
|
||||
BOOST_CHECK(callContractFunction("f(bytes2,uint16)", string("abc"), u256(0x040102)) == encodeArgs(0));
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(skip_dynamic_types)
|
||||
{
|
||||
// The EVM cannot provide access to dynamically-sized return values, so we have to skip them.
|
||||
char const* sourceCode = R"(
|
||||
contract C {
|
||||
function f() returns (uint, uint[], uint) {
|
||||
return (7, new uint[](2), 8);
|
||||
}
|
||||
function g() returns (uint, uint) {
|
||||
// Previous implementation "moved" b to the second place and did not skip.
|
||||
var (a, _, b) = this.f();
|
||||
return (a, b);
|
||||
}
|
||||
}
|
||||
)";
|
||||
compileAndRun(sourceCode, 0, "C");
|
||||
BOOST_CHECK(callContractFunction("g()") == encodeArgs(u256(7), u256(8)));
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(skip_dynamic_types_for_structs)
|
||||
{
|
||||
// For accessors, the dynamic types are already removed in the external signature itself.
|
||||
char const* sourceCode = R"(
|
||||
contract C {
|
||||
struct S {
|
||||
uint x;
|
||||
string a; // this is present in the accessor
|
||||
uint[] b; // this is not present
|
||||
uint y;
|
||||
}
|
||||
S public s;
|
||||
function g() returns (uint, uint) {
|
||||
s.x = 2;
|
||||
s.a = "abc";
|
||||
s.b = [7, 8, 9];
|
||||
s.y = 6;
|
||||
var (x, a, y) = this.s();
|
||||
return (x, y);
|
||||
}
|
||||
}
|
||||
)";
|
||||
compileAndRun(sourceCode, 0, "C");
|
||||
BOOST_CHECK(callContractFunction("g()") == encodeArgs(u256(2), u256(6)));
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
|
||||
}
|
||||
|
||||
@@ -2154,6 +2154,8 @@ BOOST_AUTO_TEST_CASE(dynamic_return_types_not_possible)
|
||||
function f(uint) returns (string);
|
||||
function g() {
|
||||
var (x,) = this.f(2);
|
||||
// we can assign to x but it is not usable.
|
||||
bytes(x).length;
|
||||
}
|
||||
}
|
||||
)";
|
||||
|
||||
Reference in New Issue
Block a user