cerc-io/solidity
15
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 #10407 from ethereum/calldataStructArrayMemberAccessSol2Yul

Browse Source 
[Sol->Yul] Implementing member access to arrays in calldata structs.
This commit is contained in:
chriseth 2020-11-26 11:59:06 +01:00 committed by GitHub
commit 101260943a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 90 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -1810,6 +1810,11 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
", " <<
offset <<
")\n";
else if (
dynamic_cast<ArrayType const*>(_memberAccess.annotation().type) ||
dynamic_cast<StructType const*>(_memberAccess.annotation().type)
)
define(_memberAccess) << offset << "\n";
else
define(_memberAccess) <<
m_utils.readFromCalldata(*_memberAccess.annotation().type) <<

5
test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
View File

@ -1,4 +1,4 @@
pragma abicoder v2;
pragma abicoder v2;
contract C {
@ -19,6 +19,7 @@ contract C {
c = s.c;
}
}
// ====
// compileViaYul: also
// ----
// f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23

24
test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol Normal file
View File

@ -0,0 +1,24 @@
pragma abicoder v2;
contract C {
struct S {
uint32 a;
uint256[] b;
uint64 c;
}
function f(S calldata s)
external
pure
returns (uint32 a, uint256 b0, uint256 b1, uint64 c)
{
a = s.a;
b0 = s.b[0];
b1 = s.b[1];
c = s.c;
}
}
// ====
// compileViaYul: also
// ----
// f((uint32,uint256[],uint64)): 0x20, 42, 0x60, 23, 2, 1, 2 -> 42, 1, 2, 23

28
test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol Normal file
View File

@ -0,0 +1,28 @@
pragma abicoder v2;
contract C {
struct S {
uint64 a;
uint64 b;
}
struct S1 {
uint256 a;
S s;
uint256 c;
}
function f(S1 calldata s1)
external
pure
returns (uint256 a, uint64 b0, uint64 b1, uint256 c)
{
a = s1.a;
b0 = s1.s.a;
b1 = s1.s.b;
c = s1.c;
}
}
// ====
// compileViaYul: also
// ----
// f((uint256,(uint64, uint64),uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23

28
test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol Normal file
View File

@ -0,0 +1,28 @@
pragma abicoder v2;
contract C {
struct S {
uint64 a;
bytes b;
}
struct S1 {
uint256 a;
S s;
uint256 c;
}
function f(S1 calldata s1)
external
pure
returns (uint256 a, uint64 b0, byte b1, uint256 c)
{
a = s1.a;
b0 = s1.s.a;
b1 = s1.s.b[0];
c = s1.c;
}
}
// ====
// compileViaYul: also
// ----
// f((uint256,(uint64, bytes),uint256)): 0x20, 42, 0x60, 23, 1, 0x40, 2, "ab" -> 42, 1, "a", 23

2
test/libsolidity/semanticTests/various/nested_calldata_struct.sol
View File

@ -22,5 +22,7 @@ contract C {
}
}
// ====
// compileViaYul: also
// ----
// f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5