cerc-io/solidity
11
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 remote-tracking branch 'origin/develop' into breaking

Browse Source
This commit is contained in:
chriseth
2020-12-09 15:24:49 +01:00
parent 806453aca9 e23cf26d98
commit b18c76e34b
51 changed files with 481 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests/yul_string_format_hex/input.json
+1 -1
View File
@@ -4,7 +4,7 @@
{
"A":
{
"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }"
"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }"
}
},
"settings":
test/cmdlineTests/yul_string_format_hex/output.json
+11 -11
View File
@@ -6,23 +6,23 @@
*******************************************************/
object \"C_10\" {
object \"C_11\" {
code {
mstore(64, 128)
if callvalue() { revert(0, 0) }
constructor_C_10()
constructor_C_11()
codecopy(0, dataoffset(\"C_10_deployed\"), datasize(\"C_10_deployed\"))
codecopy(0, dataoffset(\"C_11_deployed\"), datasize(\"C_11_deployed\"))
return(0, datasize(\"C_10_deployed\"))
return(0, datasize(\"C_11_deployed\"))
function constructor_C_10() {
function constructor_C_11() {
}
}
object \"C_10_deployed\" {
object \"C_11_deployed\" {
code {
mstore(64, 128)
@@ -36,7 +36,7 @@ object \"C_10\" {
// f()
if callvalue() { revert(0, 0) }
abi_decode_tuple_(4, calldatasize())
let ret_0 := fun_f_9()
let ret_0 := fun_f_10()
let memPos := allocateMemory(0)
let memEnd := abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(memPos , ret_0)
return(memPos, sub(memEnd, memPos))
@@ -83,12 +83,12 @@ object \"C_10\" {
converted := shift_left_224(cleanup_t_rational_2864434397_by_1(value))
}
function fun_f_9() -> vloc__4 {
function fun_f_10() -> vloc__5 {
let zero_value_for_type_t_bytes4_1 := zero_value_for_split_t_bytes4()
vloc__4 := zero_value_for_type_t_bytes4_1
vloc__5 := zero_value_for_type_t_bytes4_1
let expr_6 := 0xaabbccdd
vloc__4 := convert_t_rational_2864434397_by_1_to_t_bytes4(expr_6)
let expr_7 := 0xaabbccdd
vloc__5 := convert_t_rational_2864434397_by_1_to_t_bytes4(expr_7)
leave
}