Merge pull request #13464 from ethereum/copying_reference_types

Add tests for copying reference types between data locations

Author: ekpyron

test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol

@@ -0,0 +1,61 @@
+pragma abicoder v2;
+
+contract C {
+    mapping (uint => uint8[][]) m;
+
+    uint8[][] s;
+
+    constructor() {
+        s = new uint8[][](2);
+
+        s[0] = new uint8[](2);
+        s[0][0] = 10;
+        s[0][1] = 11;
+
+        s[1] = new uint8[](3);
+        s[1][0] = 12;
+        s[1][1] = 13;
+        s[1][2] = 14;
+    }
+
+    function from_storage() public returns (uint8[][] memory) {
+        m[0] = new uint8[][](2);
+        m[0][0] = s[0];
+        m[0][1] = s[1];
+        return m[0];
+    }
+
+
+    function from_storage_ptr() public returns (uint8[][] memory) {
+        uint8[][] storage sPtr = s;
+        m[0] = new uint8[][](2);
+        m[0][0] = sPtr[0];
+        m[0][1] = sPtr[1];
+        return m[0];
+    }
+
+
+    function from_memory() public returns (uint8[][] memory) {
+        uint8[][] memory a = s;
+        m[0] = new uint8[][](2);
+        m[0][0] = a[0];
+        m[0][1] = a[1];
+        return m[0];
+    }
+
+    function from_calldata(uint8[][] calldata _a) public returns (uint8[][] memory) {
+        m[0] = new uint8[][](2);
+        m[0][0] = _a[0];
+        m[0][1] = _a[1];
+        return m[0];
+    }
+}
+
+// ----
+// from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// gas irOptimized: 150098
+// gas legacy: 150830
+// gas legacyOptimized: 148728
+// from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14

test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol

@@ -0,0 +1,45 @@
+pragma abicoder v2;
+
+contract C {
+    uint256[][] a1;
+    uint256[][2] a2;
+    uint256[2][] a3;
+    uint256[2][2] a4;
+
+    constructor() {
+        a1 = new uint256[][](2);
+        a1[0] = [1, 2];
+        a1[1] = [3, 4, 5];
+
+        a2[0] = [6, 7, 8];
+        a2[1] = [9];
+
+        a3.push([1, 2]);
+        a3.push([3, 4]);
+        a3.push([5, 6]);
+
+        a4 = [[10, 11], [12, 13]];
+    }
+
+    function test1() external returns (uint256[][] memory) {
+        return a1;
+    }
+
+    function test2() external returns (uint256[][2] memory) {
+        return a2;
+    }
+
+    function test3() external returns (uint256[2][] memory) {
+        return a3;
+    }
+
+    function test4() external returns (uint256[2][2] memory) {
+        return a4;
+    }
+}
+
+// ----
+// test1() -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 3, 3, 4, 5
+// test2() -> 0x20, 0x40, 0xc0, 3, 6, 7, 8, 1, 9
+// test3() -> 0x20, 3, 1, 2, 3, 4, 5, 6
+// test4() -> 10, 11, 12, 13

test/libsolidity/semanticTests/array/copying/array_to_mapping.sol

@@ -0,0 +1,45 @@
+pragma abicoder v2;
+
+contract C {
+    mapping (uint => uint8[][]) m;
+
+    uint8[][] s;
+
+    constructor() {
+        s = new uint8[][](2);
+
+        s[0] = new uint8[](2);
+        s[0][0] = 10;
+        s[0][1] = 11;
+
+        s[1] = new uint8[](3);
+        s[1][0] = 12;
+        s[1][1] = 13;
+        s[1][2] = 14;
+    }
+
+    function from_storage() public returns (uint8[][] memory) {
+        m[0] = s;
+        return m[0];
+    }
+
+    function from_storage_ptr() public returns (uint8[][] memory) {
+        uint8[][] storage sPtr = s;
+        m[0] = sPtr;
+        return m[0];
+    }
+
+    function from_memory() public returns (uint8[][] memory) {
+        uint8[][] memory a = s;
+        m[0] = a;
+        return m[0];
+    }
+}
+
+// ----
+// from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// gas irOptimized: 147913
+// gas legacy: 148965
+// gas legacyOptimized: 146935
+// from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14

test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol

@@ -0,0 +1,18 @@
+pragma abicoder v2;
+
+contract C {
+    mapping (uint => uint8[][]) m;
+
+    uint8[][] s;
+
+    function from_calldata(uint8[][] calldata _a) public returns (uint8[][] memory) {
+        m[0] = _a;
+        return m[0];
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// gas irOptimized: 139927

test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol

@@ -0,0 +1,40 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[] a;
+        uint8[2] b;
+    }
+
+    S[][][] s1;
+    S[][1][] s2;
+    S[1][][1] s3;
+
+    function test1(S[][][] calldata _a) public returns (S[][] memory){
+        s1.push();
+        s1[0] = _a[0];
+        return s1[0];
+    }
+
+    function test2(S[][1][] calldata _a) public returns (S[][1] memory) {
+        s2.push();
+        s2[0] = _a[0];
+        return s2[0];
+    }
+
+    function test3(S[1][][2] calldata _a) public returns (S[1][] memory) {
+        s3[0] = _a[1];
+        return s3[0];
+    }
+}
+
+
+// ====
+// compileViaYul: true
+// ----
+// test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
+// gas irOptimized: 327878
+// test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 140894
+// test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 188509

test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol

@@ -0,0 +1,40 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[] a;
+        uint8[2] b;
+    }
+
+    S[][][] s1;
+    S[][1][] s2;
+    S[1][][1] s3;
+
+    function test1(S[][][] memory _a) public returns (S[][] memory){
+        s1.push();
+        s1[0] = _a[0];
+        return s1[0];
+    }
+
+    function test2(S[][1][] memory _a) public returns (S[][1] memory) {
+        s2.push();
+        s2[0] = _a[0];
+        return s2[0];
+    }
+
+    function test3(S[1][][2] memory _a) public returns (S[1][] memory) {
+        s3[0] = _a[1];
+        return s3[0];
+    }
+}
+
+
+// ====
+// compileViaYul: true
+// ----
+// test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
+// gas irOptimized: 332334
+// test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 145029
+// test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 192344

test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol

@@ -0,0 +1,41 @@
+pragma abicoder v2;
+
+contract C {
+    function test1(uint8[][][] calldata _a) public returns (uint8[][] memory) {
+        return _a[1];
+    }
+
+    function test2(uint8[][1][] calldata _a) public returns (uint8[][1] memory) {
+        return _a[0];
+    }
+
+    function test3(uint8[2][][2] calldata _a) public returns (uint8[2][] memory) {
+        return _a[0];
+    }
+
+    function test4(uint16[][] calldata _a) public returns (uint16[][] memory) {
+        uint16[][][] memory tmp = new uint16[][][](2);
+        tmp[1] = _a;
+        return tmp[1];
+    }
+
+    function test5(uint32[][2] calldata _a) public returns (uint32[][2] memory) {
+        uint32[][2][] memory tmp = new uint32[][2][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+
+    function test6(uint32[2][] calldata _a) public returns (uint32[2][] memory) {
+        uint32[2][][] memory tmp = new uint32[2][][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+}
+
+// ----
+// test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
+// test3(uint8[2][][2]): 0x20, 0x40, 0xa0, 1, 7, 7, 2, 8, 8, 0x09, 9 -> 0x20, 1, 7, 7
+// test4(uint16[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test5(uint32[][2]): 0x20, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 0x40, 0x80, 1, 7, 2, 8, 9
+// test6(uint32[2][]): 0x20, 2, 5, 6, 7, 8 -> 0x20, 2, 5, 6, 7, 8

test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol

@@ -0,0 +1,30 @@
+contract C {
+    uint8[2][2] a;
+    uint8[2][2][2] a2;
+
+    function test(uint8[2][2][2] calldata _a) public {
+        a = _a[0];
+        require(a[0][0] == 1);
+        require(a[0][1] == 2);
+        require(a[1][0] == 3);
+        require(a[1][1] == 4);
+    }
+
+    function test2(uint8[2][2] calldata _a) public {
+        a2[0] = _a;
+        require(a2[0][0][0] == 1);
+        require(a2[0][0][1] == 2);
+        require(a2[0][1][0] == 3);
+        require(a2[0][1][1] == 4);
+        require(a2[1][0][0] == 0);
+        require(a2[1][0][1] == 0);
+        require(a2[1][1][0] == 0);
+        require(a2[1][1][1] == 0);
+    }
+}
+
+// ----
+// test(uint8[2][2][2]): 1, 2, 3, 4, 5, 6, 7, 8
+// test2(uint8[2][2]): 1, 2, 3, 4
+// gas irOptimized: 119939
+// gas legacyOptimized: 120228

test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol

@@ -0,0 +1,41 @@
+pragma abicoder v2;
+
+contract C {
+    function test1(uint8[][][] memory _a) public returns (uint8[][] memory) {
+        return _a[1];
+    }
+
+    function test2(uint8[][1][] memory _a) public returns (uint8[][1] memory) {
+        return _a[0];
+    }
+
+    function test3(uint8[2][][2] memory _a) public returns (uint8[2][] memory) {
+        return _a[0];
+    }
+
+    function test4(uint16[][] memory _a) public returns (uint16[][] memory) {
+        uint16[][][] memory tmp = new uint16[][][](2);
+        tmp[1] = _a;
+        return tmp[1];
+    }
+
+    function test5(uint32[][2] memory _a) public returns (uint32[][2] memory) {
+        uint32[][2][] memory tmp = new uint32[][2][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+
+    function test6(uint32[2][] memory _a) public returns (uint32[2][] memory) {
+        uint32[2][][] memory tmp = new uint32[2][][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+}
+
+// ----
+// test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
+// test3(uint8[2][][2]): 0x20, 0x40, 0xa0, 1, 7, 7, 2, 8, 8, 0x09, 9 -> 0x20, 1, 7, 7
+// test4(uint16[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test5(uint32[][2]): 0x20, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 0x40, 0x80, 1, 7, 2, 8, 9
+// test6(uint32[2][]): 0x20, 2, 5, 6, 7, 8 -> 0x20, 2, 5, 6, 7, 8