mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #10575 from ethereum/calldataArraySlices
Conversion of calldata array slices to memory
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
pragma abicoder v2;
|
||||
contract Test {
|
||||
function f(uint256[] calldata c) internal returns (uint a, uint b) {
|
||||
return (c.length, c[0]);
|
||||
}
|
||||
|
||||
function g(uint256[] calldata c) external returns (uint a, uint b) {
|
||||
return f(c);
|
||||
}
|
||||
|
||||
function h(uint256[] calldata c, uint start, uint end) external returns (uint a, uint b) {
|
||||
return f(c[start: end]);
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// g(uint256[]): 0x20, 4, 1, 2, 3, 4 -> 4, 1
|
||||
// h(uint256[], uint256, uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2, 2
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
contract C {
|
||||
function f1(bytes calldata c1, uint256 s, uint256 e, bytes calldata c2) public returns (bool) {
|
||||
return keccak256(c1[s:e]) == keccak256(c2);
|
||||
}
|
||||
|
||||
function f2(bytes calldata c, uint256 s) public returns (uint256, bytes memory) {
|
||||
return abi.decode(c[s:], (uint256, bytes));
|
||||
}
|
||||
|
||||
function f3(bytes calldata c1, uint256 s, uint256 e, bytes calldata c2) public returns (bool) {
|
||||
bytes memory a = abi.encode(c1[s:e]);
|
||||
bytes memory b = abi.encode(c2);
|
||||
if (a.length != b.length) { return false; }
|
||||
for (uint256 i = 0; i < a.length; i++) {
|
||||
if (a[i] != b[i]) { return false; }
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function f4(bytes calldata c1, uint256 s, uint256 e, bytes calldata c2) public returns (bool) {
|
||||
bytes memory a = abi.encodePacked(c1[s:e]);
|
||||
bytes memory b = abi.encodePacked(c2);
|
||||
if (a.length != b.length) { return false; }
|
||||
for (uint256 i = 0; i < a.length; i++) {
|
||||
if (a[i] != b[i]) { return false; }
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
|
||||
// f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
|
||||
// f2(bytes,uint256): 0x40, 0, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
|
||||
// f3(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
|
||||
// f3(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
|
||||
// f4(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
|
||||
// f4(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
|
||||
@@ -0,0 +1,27 @@
|
||||
pragma abicoder v2;
|
||||
|
||||
contract C {
|
||||
struct S {
|
||||
uint128 p1;
|
||||
uint256[3] a;
|
||||
uint32 p2;
|
||||
}
|
||||
function f(S[] calldata c) internal returns (S[] memory) {
|
||||
return c;
|
||||
}
|
||||
function g(S[] calldata c, uint256 s, uint256 e) public returns (S[] memory) {
|
||||
return f(c[s:e]);
|
||||
}
|
||||
|
||||
function f1(uint256[3][] calldata c) internal returns (uint256[3][] memory) {
|
||||
return c;
|
||||
}
|
||||
function g1(uint256[3][] calldata c, uint256 s, uint256 e) public returns (uint256[3][] memory) {
|
||||
return f1(c[s:e]);
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// g((uint128, uint256[3], uint32)[], uint256, uint256): 0x60, 1, 3, 4, 55, 1, 2, 3, 66, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88, 88, 4, 5, 6, 99 -> 0x20, 2, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88
|
||||
// g1(uint256[3][], uint256, uint256): 0x60, 1, 3, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> 0x20, 2, 4, 5, 6, 7, 8, 9
|
||||
@@ -0,0 +1,29 @@
|
||||
contract C {
|
||||
function f(int[] calldata b, uint256 start, uint256 end) public returns (int) {
|
||||
int[] memory m = b[start:end];
|
||||
uint len = end - start;
|
||||
assert(len == m.length);
|
||||
for (uint i = 0; i < len; i++) {
|
||||
assert(b[start:end][i] == m[i]);
|
||||
}
|
||||
return [b[start:end]][0][0];
|
||||
}
|
||||
|
||||
function g(int[] calldata b, uint256 start, uint256 end) public returns (int[] memory) {
|
||||
return b[start:end];
|
||||
}
|
||||
|
||||
function h1(int[] memory b) internal returns (int[] memory) {
|
||||
return b;
|
||||
}
|
||||
|
||||
function h(int[] calldata b, uint256 start, uint256 end) public returns (int[] memory) {
|
||||
return h1(b[start:end]);
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(int256[], uint256, uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
|
||||
// g(int256[], uint256, uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 0x20, 2, 2, 3
|
||||
// h(int256[], uint256, uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 0x20, 2, 2, 3
|
||||
@@ -0,0 +1,16 @@
|
||||
contract C {
|
||||
int[] s;
|
||||
function f(int[] calldata b, uint256 start, uint256 end) public returns (int) {
|
||||
s = b[start:end];
|
||||
uint len = end - start;
|
||||
assert(len == s.length);
|
||||
for (uint i = 0; i < len; i++) {
|
||||
assert(b[start:end][i] == s[i]);
|
||||
}
|
||||
return s[0];
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(int256[], uint256, uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
|
||||
@@ -5,4 +5,3 @@ contract c {
|
||||
}
|
||||
}
|
||||
// ----
|
||||
// TypeError 7407: (63-74): Type bytes calldata slice is not implicitly convertible to expected type bytes storage ref.
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
contract C {
|
||||
function f(bytes calldata x) external {
|
||||
bytes memory y = x[1:2];
|
||||
function f(bytes calldata x) external pure returns (bytes memory) {
|
||||
return x[1:2];
|
||||
}
|
||||
}
|
||||
// ----
|
||||
// TypeError 9574: (65-88): Type bytes calldata slice is not implicitly convertible to expected type bytes memory.
|
||||
}
|
||||
@@ -4,4 +4,3 @@ contract C {
|
||||
}
|
||||
}
|
||||
// ----
|
||||
// TypeError 9553: (79-85): Invalid type for argument in function call. Invalid implicit conversion from bytes calldata slice to bytes memory requested.
|
||||
|
||||
Reference in New Issue
Block a user