cerc-io/solidity
10
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

Fix: Use correct byte offset separation

Browse Source 
":" instead of ","
This commit is contained in:
Marenz 2021-07-15 12:31:48 +02:00
parent 90f77f8c1f
commit 57db4c82ba
12 changed files with 171 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/codegen/ir/Common.cpp
View File

@ -134,7 +134,7 @@ string sourceLocationComment(langutil::SourceLocation const& _location, IRGenera
+ to_string(_context.sourceIndices().at(*_location.sourceName)) + to_string(_context.sourceIndices().at(*_location.sourceName))
+ ":" + ":"
+ to_string(_location.start) + to_string(_location.start)
+ "," + ":"
+ to_string(_location.end); + to_string(_location.end);
} }

98
test/cmdlineTests/exp_base_literal/output
View File

@ -9,7 +9,7 @@ IR:
object "C_81" { object "C_81" {
code { code {
/// @src 0:82,370 /// @src 0:82:370
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -26,7 +26,7 @@ object "C_81" {
function constructor_C_81() { function constructor_C_81() {
/// @src 0:82,370 /// @src 0:82:370
} }
@ -37,7 +37,7 @@ object "C_81" {
} }
object "C_81_deployed" { object "C_81_deployed" {
code { code {
/// @src 0:82,370 /// @src 0:82:370
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -212,122 +212,122 @@ object "C_81" {
} }
function fun_f_80(var_a_4, var_b_6, var_c_8, var_d_10) -> var__13, var__15, var__17, var__19 { function fun_f_80(var_a_4, var_b_6, var_c_8, var_d_10) -> var__13, var__15, var__17, var__19 {
/// @src 0:96,368 /// @src 0:96:368
/// @src 0:160,164 /// @src 0:160:164
let zero_t_uint256_1 := zero_value_for_split_t_uint256() let zero_t_uint256_1 := zero_value_for_split_t_uint256()
var__13 := zero_t_uint256_1 var__13 := zero_t_uint256_1
/// @src 0:166,169 /// @src 0:166:169
let zero_t_int256_2 := zero_value_for_split_t_int256() let zero_t_int256_2 := zero_value_for_split_t_int256()
var__15 := zero_t_int256_2 var__15 := zero_t_int256_2
/// @src 0:171,175 /// @src 0:171:175
let zero_t_uint256_3 := zero_value_for_split_t_uint256() let zero_t_uint256_3 := zero_value_for_split_t_uint256()
var__17 := zero_t_uint256_3 var__17 := zero_t_uint256_3
/// @src 0:177,181 /// @src 0:177:181
let zero_t_uint256_4 := zero_value_for_split_t_uint256() let zero_t_uint256_4 := zero_value_for_split_t_uint256()
var__19 := zero_t_uint256_4 var__19 := zero_t_uint256_4
/// @src 0:196,197 /// @src 0:196:197
let expr_23 := 0x02 let expr_23 := 0x02
/// @src 0:199,200 /// @src 0:199:200
let _5 := var_a_4 let _5 := var_a_4
let expr_24 := _5 let expr_24 := _5
/// @src 0:196,200 /// @src 0:196:200
let _6 := convert_t_rational_2_by_1_to_t_uint256(expr_23) let _6 := convert_t_rational_2_by_1_to_t_uint256(expr_23)
let expr_25 := checked_exp_t_rational_2_by_1_t_uint256(expr_24) let expr_25 := checked_exp_t_rational_2_by_1_t_uint256(expr_24)
/// @src 0:187,200 /// @src 0:187:200
let var_w_22 := expr_25 let var_w_22 := expr_25
/// @src 0:213,215 /// @src 0:213:215
let expr_30 := 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe let expr_30 := 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
/// @src 0:212,216 /// @src 0:212:216
let expr_31 := expr_30 let expr_31 := expr_30
/// @src 0:218,219 /// @src 0:218:219
let _7 := var_b_6 let _7 := var_b_6
let expr_32 := _7 let expr_32 := _7
/// @src 0:212,219 /// @src 0:212:219
let _8 := convert_t_rational_minus_2_by_1_to_t_int256(expr_31) let _8 := convert_t_rational_minus_2_by_1_to_t_int256(expr_31)
let expr_33 := checked_exp_t_rational_minus_2_by_1_t_uint256(expr_32) let expr_33 := checked_exp_t_rational_minus_2_by_1_t_uint256(expr_32)
/// @src 0:204,219 /// @src 0:204:219
let var_x_28 := expr_33 let var_x_28 := expr_33
/// @src 0:232,234 /// @src 0:232:234
let expr_37 := 0x0a let expr_37 := 0x0a
/// @src 0:236,237 /// @src 0:236:237
let _9 := var_c_8 let _9 := var_c_8
let expr_38 := _9 let expr_38 := _9
/// @src 0:232,237 /// @src 0:232:237
let _10 := convert_t_rational_10_by_1_to_t_uint256(expr_37) let _10 := convert_t_rational_10_by_1_to_t_uint256(expr_37)
let expr_39 := checked_exp_t_rational_10_by_1_t_uint256(expr_38) let expr_39 := checked_exp_t_rational_10_by_1_t_uint256(expr_38)
/// @src 0:223,237 /// @src 0:223:237
let var_y_36 := expr_39 let var_y_36 := expr_39
/// @src 0:251,260 /// @src 0:251:260
let expr_47 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff let expr_47 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
/// @src 0:250,262 /// @src 0:250:262
let expr_48 := expr_47 let expr_48 := expr_47
/// @src 0:264,265 /// @src 0:264:265
let _11 := var_d_10 let _11 := var_d_10
let expr_49 := _11 let expr_49 := _11
/// @src 0:250,265 /// @src 0:250:265
let _12 := convert_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_to_t_uint256(expr_48) let _12 := convert_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_to_t_uint256(expr_48)
let expr_50 := checked_exp_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_t_uint256(expr_49) let expr_50 := checked_exp_t_rational_115792089237316195423570985008687907853269984665640564039457584007913129639935_by_1_t_uint256(expr_49)
/// @src 0:241,265 /// @src 0:241:265
let var_z_42 := expr_50 let var_z_42 := expr_50
/// @src 0:308,309 /// @src 0:308:309
let expr_53 := 0x00 let expr_53 := 0x00
/// @src 0:307,310 /// @src 0:307:310
let expr_54 := expr_53 let expr_54 := expr_53
/// @src 0:312,313 /// @src 0:312:313
let _13 := var_a_4 let _13 := var_a_4
let expr_55 := _13 let expr_55 := _13
/// @src 0:307,313 /// @src 0:307:313
let _14 := convert_t_rational_0_by_1_to_t_uint256(expr_54) let _14 := convert_t_rational_0_by_1_to_t_uint256(expr_54)
let expr_56 := checked_exp_t_rational_0_by_1_t_uint256(expr_55) let expr_56 := checked_exp_t_rational_0_by_1_t_uint256(expr_55)
/// @src 0:303,313 /// @src 0:303:313
var_w_22 := expr_56 var_w_22 := expr_56
let expr_57 := expr_56 let expr_57 := expr_56
/// @src 0:322,324 /// @src 0:322:324
let expr_61 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff let expr_61 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
/// @src 0:321,325 /// @src 0:321:325
let expr_62 := expr_61 let expr_62 := expr_61
/// @src 0:327,328 /// @src 0:327:328
let _15 := var_b_6 let _15 := var_b_6
let expr_63 := _15 let expr_63 := _15
/// @src 0:321,328 /// @src 0:321:328
let _16 := convert_t_rational_minus_1_by_1_to_t_int256(expr_62) let _16 := convert_t_rational_minus_1_by_1_to_t_int256(expr_62)
let expr_64 := checked_exp_t_rational_minus_1_by_1_t_uint256(expr_63) let expr_64 := checked_exp_t_rational_minus_1_by_1_t_uint256(expr_63)
/// @src 0:317,328 /// @src 0:317:328
var_x_28 := expr_64 var_x_28 := expr_64
let expr_65 := expr_64 let expr_65 := expr_64
/// @src 0:336,337 /// @src 0:336:337
let expr_68 := 0x01 let expr_68 := 0x01
/// @src 0:339,340 /// @src 0:339:340
let _17 := var_c_8 let _17 := var_c_8
let expr_69 := _17 let expr_69 := _17
/// @src 0:336,340 /// @src 0:336:340
let _18 := convert_t_rational_1_by_1_to_t_uint256(expr_68) let _18 := convert_t_rational_1_by_1_to_t_uint256(expr_68)
let expr_70 := checked_exp_t_rational_1_by_1_t_uint256(expr_69) let expr_70 := checked_exp_t_rational_1_by_1_t_uint256(expr_69)
/// @src 0:332,340 /// @src 0:332:340
var_y_36 := expr_70 var_y_36 := expr_70
let expr_71 := expr_70 let expr_71 := expr_70
/// @src 0:353,354 /// @src 0:353:354
let _19 := var_w_22 let _19 := var_w_22
let expr_73 := _19 let expr_73 := _19
/// @src 0:352,364 /// @src 0:352:364
let expr_77_component_1 := expr_73 let expr_77_component_1 := expr_73
/// @src 0:356,357 /// @src 0:356:357
let _20 := var_x_28 let _20 := var_x_28
let expr_74 := _20 let expr_74 := _20
/// @src 0:352,364 /// @src 0:352:364
let expr_77_component_2 := expr_74 let expr_77_component_2 := expr_74
/// @src 0:359,360 /// @src 0:359:360
let _21 := var_y_36 let _21 := var_y_36
let expr_75 := _21 let expr_75 := _21
/// @src 0:352,364 /// @src 0:352:364
let expr_77_component_3 := expr_75 let expr_77_component_3 := expr_75
/// @src 0:362,363 /// @src 0:362:363
let _22 := var_z_42 let _22 := var_z_42
let expr_76 := _22 let expr_76 := _22
/// @src 0:352,364 /// @src 0:352:364
let expr_77_component_4 := expr_76 let expr_77_component_4 := expr_76
/// @src 0:345,364 /// @src 0:345:364
var__13 := expr_77_component_1 var__13 := expr_77_component_1
var__15 := expr_77_component_2 var__15 := expr_77_component_2
var__17 := expr_77_component_3 var__17 := expr_77_component_3

8
test/cmdlineTests/revert_strings/output
View File

@ -9,7 +9,7 @@ IR:
object "C_15" { object "C_15" {
code { code {
/// @src 0:59,147 /// @src 0:59:147
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -26,7 +26,7 @@ object "C_15" {
function constructor_C_15() { function constructor_C_15() {
/// @src 0:59,147 /// @src 0:59:147
} }
@ -52,7 +52,7 @@ object "C_15" {
} }
object "C_15_deployed" { object "C_15_deployed" {
code { code {
/// @src 0:59,147 /// @src 0:59:147
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -217,7 +217,7 @@ object "C_15" {
} }
function fun_f_14(var__7_mpos, var_e_10) { function fun_f_14(var__7_mpos, var_e_10) {
/// @src 0:93,145 /// @src 0:93:145
} }

8
test/cmdlineTests/standard_ir_requested/output.json
View File

@ -8,7 +8,7 @@
object \"C_7\" { object \"C_7\" {
code { code {
/// @src 0:79,121 /// @src 0:79:121
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -25,7 +25,7 @@ object \"C_7\" {
function constructor_C_7() { function constructor_C_7() {
/// @src 0:79,121 /// @src 0:79:121
} }
@ -36,7 +36,7 @@ object \"C_7\" {
} }
object \"C_7_deployed\" { object \"C_7_deployed\" {
code { code {
/// @src 0:79,121 /// @src 0:79:121
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -76,7 +76,7 @@ object \"C_7\" {
} }
function fun_f_6() { function fun_f_6() {
/// @src 0:92,119 /// @src 0:92:119
} }

24
test/cmdlineTests/standard_viair_requested/output.json
View File

@ -8,7 +8,7 @@
object \"C_3\" { object \"C_3\" {
code { code {
/// @src 0:79,92 /// @src 0:79:92
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -25,7 +25,7 @@ object \"C_3\" {
function constructor_C_3() { function constructor_C_3() {
/// @src 0:79,92 /// @src 0:79:92
} }
@ -36,7 +36,7 @@ object \"C_3\" {
} }
object \"C_3_deployed\" { object \"C_3_deployed\" {
code { code {
/// @src 0:79,92 /// @src 0:79:92
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -81,7 +81,7 @@ object \"C_3\" {
object \"D_16\" { object \"D_16\" {
code { code {
/// @src 0:93,146 /// @src 0:93:146
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -98,7 +98,7 @@ object \"D_16\" {
function constructor_D_16() { function constructor_D_16() {
/// @src 0:93,146 /// @src 0:93:146
} }
@ -109,7 +109,7 @@ object \"D_16\" {
} }
object \"D_16_deployed\" { object \"D_16_deployed\" {
code { code {
/// @src 0:93,146 /// @src 0:93:146
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -149,9 +149,9 @@ object \"D_16\" {
} }
function fun_f_15() { function fun_f_15() {
/// @src 0:106,144 /// @src 0:106:144
/// @src 0:134,141 /// @src 0:134:141
let _1 := allocate_unbounded() let _1 := allocate_unbounded()
let _2 := add(_1, datasize(\"C_3\")) let _2 := add(_1, datasize(\"C_3\"))
if or(gt(_2, 0xffffffffffffffff), lt(_2, _1)) { panic_error_0x41() } if or(gt(_2, 0xffffffffffffffff), lt(_2, _1)) { panic_error_0x41() }
@ -162,7 +162,7 @@ object \"D_16\" {
if iszero(expr_12_address) { revert_forward_1() } if iszero(expr_12_address) { revert_forward_1() }
/// @src 0:128,141 /// @src 0:128:141
let var_c_8_address := expr_12_address let var_c_8_address := expr_12_address
} }
@ -208,7 +208,7 @@ object \"D_16\" {
object \"C_3\" { object \"C_3\" {
code { code {
/// @src 0:79,92 /// @src 0:79:92
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -225,7 +225,7 @@ object \"D_16\" {
function constructor_C_3() { function constructor_C_3() {
/// @src 0:79,92 /// @src 0:79:92
} }
@ -236,7 +236,7 @@ object \"D_16\" {
} }
object \"C_3_deployed\" { object \"C_3_deployed\" {
code { code {
/// @src 0:79,92 /// @src 0:79:92
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))

14
test/cmdlineTests/viair_abicoder_v1/output
View File

@ -9,7 +9,7 @@ IR:
object "test_11" { object "test_11" {
code { code {
/// @src 0:79,169 /// @src 0:79:169
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -26,7 +26,7 @@ object "test_11" {
function constructor_test_11() { function constructor_test_11() {
/// @src 0:79,169 /// @src 0:79:169
} }
@ -37,7 +37,7 @@ object "test_11" {
} }
object "test_11_deployed" { object "test_11_deployed" {
code { code {
/// @src 0:79,169 /// @src 0:79:169
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -87,14 +87,14 @@ object "test_11" {
} }
function fun_f_10() -> var__5 { function fun_f_10() -> var__5 {
/// @src 0:99,167 /// @src 0:99:167
/// @src 0:133,137 /// @src 0:133:137
let zero_t_bool_1 := zero_value_for_split_t_bool() let zero_t_bool_1 := zero_value_for_split_t_bool()
var__5 := zero_t_bool_1 var__5 := zero_t_bool_1
/// @src 0:156,160 /// @src 0:156:160
let expr_7 := 0x01 let expr_7 := 0x01
/// @src 0:149,160 /// @src 0:149:160
var__5 := expr_7 var__5 := expr_7
leave leave

124
test/cmdlineTests/yul_source_locations/output.json
View File

@ -8,7 +8,7 @@
object \"C_54\" { object \"C_54\" {
code { code {
/// @src 0:79,428 /// @src 0:79:428
mstore(64, 160) mstore(64, 160)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -54,17 +54,17 @@ object \"C_54\" {
function constructor_C_54(var__init_12) { function constructor_C_54(var__init_12) {
/// @src 0:175,223 /// @src 0:175:223
/// @src 0:147,149 /// @src 0:147:149
let expr_7 := 0x2a let expr_7 := 0x2a
let _3 := convert_t_rational_42_by_1_to_t_int256(expr_7) let _3 := convert_t_rational_42_by_1_to_t_int256(expr_7)
mstore(128, _3) mstore(128, _3)
/// @src 0:214,219 /// @src 0:214:219
let _4 := var__init_12 let _4 := var__init_12
let expr_16 := _4 let expr_16 := _4
/// @src 0:203,219 /// @src 0:203:219
update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16) update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
let expr_17 := expr_16 let expr_17 := expr_16
@ -147,7 +147,7 @@ object \"C_54\" {
} }
object \"C_54_deployed\" { object \"C_54_deployed\" {
code { code {
/// @src 0:79,428 /// @src 0:79:428
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -262,9 +262,9 @@ object \"C_54\" {
cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff) cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
} }
/// @src 0:93,119 /// @src 0:93:119
function constant_constVar_5() -> ret { function constant_constVar_5() -> ret {
/// @src 0:117,119 /// @src 0:117:119
let expr_4 := 0x29 let expr_4 := 0x29
let _2 := convert_t_rational_41_by_1_to_t_int256(expr_4) let _2 := convert_t_rational_41_by_1_to_t_int256(expr_4)
@ -303,8 +303,8 @@ object \"C_54\" {
} }
function fun_f2_53() -> var__42 { function fun_f2_53() -> var__42 {
/// @src 0:343,426 /// @src 0:343:426
/// @src 0:375,378 /// @src 0:375:378
let zero_t_int256_4 := zero_value_for_split_t_int256() let zero_t_int256_4 := zero_value_for_split_t_int256()
var__42 := zero_t_int256_4 var__42 := zero_t_int256_4
@ -312,18 +312,18 @@ object \"C_54\" {
} }
function fun_f2_53_inner(_8) -> var__42 { function fun_f2_53_inner(_8) -> var__42 {
/// @src 0:343,426 /// @src 0:343:426
var__42 := _8 var__42 := _8
/// @src 0:392,400 /// @src 0:392:400
let _9 := read_from_storage_split_offset_0_t_int256(0x00) let _9 := read_from_storage_split_offset_0_t_int256(0x00)
let expr_44 := _9 let expr_44 := _9
/// @src 0:403,407 /// @src 0:403:407
let expr_45_address := address() let expr_45_address := address()
/// @src 0:403,409 /// @src 0:403:409
let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address) let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address)
let expr_46_functionSelector := 0x26121ff0 let expr_46_functionSelector := 0x26121ff0
/// @src 0:403,411 /// @src 0:403:411
if iszero(extcodesize(expr_46_address)) { revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() } if iszero(extcodesize(expr_46_address)) { revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() }
// storage for arguments and returned data // storage for arguments and returned data
@ -344,43 +344,43 @@ object \"C_54\" {
// decode return parameters from external try-call into retVars // decode return parameters from external try-call into retVars
expr_47 := abi_decode_tuple_t_int256_fromMemory(_10, add(_10, returndatasize())) expr_47 := abi_decode_tuple_t_int256_fromMemory(_10, add(_10, returndatasize()))
} }
/// @src 0:392,411 /// @src 0:392:411
let expr_48 := checked_add_t_int256(expr_44, expr_47) let expr_48 := checked_add_t_int256(expr_44, expr_47)
/// @src 0:414,422 /// @src 0:414:422
let _13 := loadimmutable(\"8\") let _13 := loadimmutable(\"8\")
let expr_49 := _13 let expr_49 := _13
/// @src 0:392,422 /// @src 0:392:422
let expr_50 := checked_add_t_int256(expr_48, expr_49) let expr_50 := checked_add_t_int256(expr_48, expr_49)
/// @src 0:385,422 /// @src 0:385:422
var__42 := expr_50 var__42 := expr_50
leave leave
} }
function fun_f_30() -> var__23 { function fun_f_30() -> var__23 {
/// @src 0:226,302 /// @src 0:226:302
/// @src 0:262,265 /// @src 0:262:265
let zero_t_int256_1 := zero_value_for_split_t_int256() let zero_t_int256_1 := zero_value_for_split_t_int256()
var__23 := zero_t_int256_1 var__23 := zero_t_int256_1
/// @src 0:279,287 /// @src 0:279:287
let expr_25 := constant_constVar_5() let expr_25 := constant_constVar_5()
/// @src 0:290,298 /// @src 0:290:298
let _3 := loadimmutable(\"8\") let _3 := loadimmutable(\"8\")
let expr_26 := _3 let expr_26 := _3
/// @src 0:279,298 /// @src 0:279:298
let expr_27 := checked_add_t_int256(expr_25, expr_26) let expr_27 := checked_add_t_int256(expr_25, expr_26)
/// @src 0:272,298 /// @src 0:272:298
var__23 := expr_27 var__23 := expr_27
leave leave
} }
function getter_fun_stateVar_10() -> ret { function getter_fun_stateVar_10() -> ret {
/// @src 0:152,171 /// @src 0:152:171
let slot := 0 let slot := 0
let offset := 0 let offset := 0
@ -396,15 +396,15 @@ object \"C_54\" {
} }
function modifier_m_40(var__42) -> _5 { function modifier_m_40(var__42) -> _5 {
/// @src 0:304,341 /// @src 0:304:341
_5 := var__42 _5 := var__42
/// @src 0:322,332 /// @src 0:322:332
let _7 := read_from_storage_split_offset_0_t_int256(0x00) let _7 := read_from_storage_split_offset_0_t_int256(0x00)
let _6 := increment_t_int256(_7) let _6 := increment_t_int256(_7)
update_storage_value_offset_0t_int256_to_t_int256(0x00, _6) update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
let expr_33 := _7 let expr_33 := _7
/// @src 0:336,337 /// @src 0:336:337
_5 := fun_f2_53_inner(var__42) _5 := fun_f2_53_inner(var__42)
} }
@ -537,7 +537,7 @@ object \"C_54\" {
object \"D_72\" { object \"D_72\" {
code { code {
/// @src 1:91,166 /// @src 1:91:166
mstore(64, 160) mstore(64, 160)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -599,34 +599,34 @@ object \"D_72\" {
function constructor_C_54(var__init_12) { function constructor_C_54(var__init_12) {
/// @src 0:175,223 /// @src 0:175:223
/// @src 0:147,149 /// @src 0:147:149
let expr_7 := 0x2a let expr_7 := 0x2a
let _6 := convert_t_rational_42_by_1_to_t_int256(expr_7) let _6 := convert_t_rational_42_by_1_to_t_int256(expr_7)
mstore(128, _6) mstore(128, _6)
/// @src 0:214,219 /// @src 0:214:219
let _7 := var__init_12 let _7 := var__init_12
let expr_16 := _7 let expr_16 := _7
/// @src 0:203,219 /// @src 0:203:219
update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16) update_storage_value_offset_0t_int256_to_t_int256(0x00, expr_16)
let expr_17 := expr_16 let expr_17 := expr_16
} }
function constructor_D_72(var__init2_63) { function constructor_D_72(var__init2_63) {
/// @src 1:107,108 /// @src 1:107:108
let expr_60 := 0x03 let expr_60 := 0x03
let _3 := convert_t_rational_3_by_1_to_t_int256(expr_60) let _3 := convert_t_rational_3_by_1_to_t_int256(expr_60)
/// @src 1:113,164 /// @src 1:113:164
constructor_C_54(_3) constructor_C_54(_3)
/// @src 1:154,160 /// @src 1:154:160
let _4 := var__init2_63 let _4 := var__init2_63
let expr_67 := _4 let expr_67 := _4
/// @src 1:142,160 /// @src 1:142:160
let _5 := read_from_storage_split_offset_0_t_int256(0x00) let _5 := read_from_storage_split_offset_0_t_int256(0x00)
let expr_68 := checked_add_t_int256(_5, expr_67) let expr_68 := checked_add_t_int256(_5, expr_67)
@ -737,7 +737,7 @@ object \"D_72\" {
} }
object \"D_72_deployed\" { object \"D_72_deployed\" {
code { code {
/// @src 1:91,166 /// @src 1:91:166
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -852,9 +852,9 @@ object \"D_72\" {
cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff) cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
} }
/// @src 0:93,119 /// @src 0:93:119
function constant_constVar_5() -> ret { function constant_constVar_5() -> ret {
/// @src 0:117,119 /// @src 0:117:119
let expr_4 := 0x29 let expr_4 := 0x29
let _2 := convert_t_rational_41_by_1_to_t_int256(expr_4) let _2 := convert_t_rational_41_by_1_to_t_int256(expr_4)
@ -893,8 +893,8 @@ object \"D_72\" {
} }
function fun_f2_53() -> var__42 { function fun_f2_53() -> var__42 {
/// @src 0:343,426 /// @src 0:343:426
/// @src 0:375,378 /// @src 0:375:378
let zero_t_int256_4 := zero_value_for_split_t_int256() let zero_t_int256_4 := zero_value_for_split_t_int256()
var__42 := zero_t_int256_4 var__42 := zero_t_int256_4
@ -902,18 +902,18 @@ object \"D_72\" {
} }
function fun_f2_53_inner(_8) -> var__42 { function fun_f2_53_inner(_8) -> var__42 {
/// @src 0:343,426 /// @src 0:343:426
var__42 := _8 var__42 := _8
/// @src 0:392,400 /// @src 0:392:400
let _9 := read_from_storage_split_offset_0_t_int256(0x00) let _9 := read_from_storage_split_offset_0_t_int256(0x00)
let expr_44 := _9 let expr_44 := _9
/// @src 0:403,407 /// @src 0:403:407
let expr_45_address := address() let expr_45_address := address()
/// @src 0:403,409 /// @src 0:403:409
let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address) let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address)
let expr_46_functionSelector := 0x26121ff0 let expr_46_functionSelector := 0x26121ff0
/// @src 0:403,411 /// @src 0:403:411
if iszero(extcodesize(expr_46_address)) { revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() } if iszero(extcodesize(expr_46_address)) { revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() }
// storage for arguments and returned data // storage for arguments and returned data
@ -934,43 +934,43 @@ object \"D_72\" {
// decode return parameters from external try-call into retVars // decode return parameters from external try-call into retVars
expr_47 := abi_decode_tuple_t_int256_fromMemory(_10, add(_10, returndatasize())) expr_47 := abi_decode_tuple_t_int256_fromMemory(_10, add(_10, returndatasize()))
} }
/// @src 0:392,411 /// @src 0:392:411
let expr_48 := checked_add_t_int256(expr_44, expr_47) let expr_48 := checked_add_t_int256(expr_44, expr_47)
/// @src 0:414,422 /// @src 0:414:422
let _13 := loadimmutable(\"8\") let _13 := loadimmutable(\"8\")
let expr_49 := _13 let expr_49 := _13
/// @src 0:392,422 /// @src 0:392:422
let expr_50 := checked_add_t_int256(expr_48, expr_49) let expr_50 := checked_add_t_int256(expr_48, expr_49)
/// @src 0:385,422 /// @src 0:385:422
var__42 := expr_50 var__42 := expr_50
leave leave
} }
function fun_f_30() -> var__23 { function fun_f_30() -> var__23 {
/// @src 0:226,302 /// @src 0:226:302
/// @src 0:262,265 /// @src 0:262:265
let zero_t_int256_1 := zero_value_for_split_t_int256() let zero_t_int256_1 := zero_value_for_split_t_int256()
var__23 := zero_t_int256_1 var__23 := zero_t_int256_1
/// @src 0:279,287 /// @src 0:279:287
let expr_25 := constant_constVar_5() let expr_25 := constant_constVar_5()
/// @src 0:290,298 /// @src 0:290:298
let _3 := loadimmutable(\"8\") let _3 := loadimmutable(\"8\")
let expr_26 := _3 let expr_26 := _3
/// @src 0:279,298 /// @src 0:279:298
let expr_27 := checked_add_t_int256(expr_25, expr_26) let expr_27 := checked_add_t_int256(expr_25, expr_26)
/// @src 0:272,298 /// @src 0:272:298
var__23 := expr_27 var__23 := expr_27
leave leave
} }
function getter_fun_stateVar_10() -> ret { function getter_fun_stateVar_10() -> ret {
/// @src 0:152,171 /// @src 0:152:171
let slot := 0 let slot := 0
let offset := 0 let offset := 0
@ -986,15 +986,15 @@ object \"D_72\" {
} }
function modifier_m_40(var__42) -> _5 { function modifier_m_40(var__42) -> _5 {
/// @src 0:304,341 /// @src 0:304:341
_5 := var__42 _5 := var__42
/// @src 0:322,332 /// @src 0:322:332
let _7 := read_from_storage_split_offset_0_t_int256(0x00) let _7 := read_from_storage_split_offset_0_t_int256(0x00)
let _6 := increment_t_int256(_7) let _6 := increment_t_int256(_7)
update_storage_value_offset_0t_int256_to_t_int256(0x00, _6) update_storage_value_offset_0t_int256_to_t_int256(0x00, _6)
let expr_33 := _7 let expr_33 := _7
/// @src 0:336,337 /// @src 0:336:337
_5 := fun_f2_53_inner(var__42) _5 := fun_f2_53_inner(var__42)
} }

12
test/cmdlineTests/yul_string_format_ascii/output.json
View File

@ -8,7 +8,7 @@
object \"C_11\" { object \"C_11\" {
code { code {
/// @src 0:78,164 /// @src 0:78:164
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -25,7 +25,7 @@ object \"C_11\" {
function constructor_C_11() { function constructor_C_11() {
/// @src 0:78,164 /// @src 0:78:164
} }
@ -36,7 +36,7 @@ object \"C_11\" {
} }
object \"C_11_deployed\" { object \"C_11_deployed\" {
code { code {
/// @src 0:78,164 /// @src 0:78:164
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -150,12 +150,12 @@ object \"C_11\" {
} }
function fun_f_10() -> var__5_mpos { function fun_f_10() -> var__5_mpos {
/// @src 0:91,162 /// @src 0:91:162
/// @src 0:127,140 /// @src 0:127:140
let zero_t_string_memory_ptr_1_mpos := zero_value_for_split_t_string_memory_ptr() let zero_t_string_memory_ptr_1_mpos := zero_value_for_split_t_string_memory_ptr()
var__5_mpos := zero_t_string_memory_ptr_1_mpos var__5_mpos := zero_t_string_memory_ptr_1_mpos
/// @src 0:144,159 /// @src 0:144:159
var__5_mpos := convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_string_memory_ptr() var__5_mpos := convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_string_memory_ptr()
leave leave

12
test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
View File

@ -8,7 +8,7 @@
object \"C_11\" { object \"C_11\" {
code { code {
/// @src 0:78,158 /// @src 0:78:158
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -25,7 +25,7 @@ object \"C_11\" {
function constructor_C_11() { function constructor_C_11() {
/// @src 0:78,158 /// @src 0:78:158
} }
@ -36,7 +36,7 @@ object \"C_11\" {
} }
object \"C_11_deployed\" { object \"C_11_deployed\" {
code { code {
/// @src 0:78,158 /// @src 0:78:158
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -90,12 +90,12 @@ object \"C_11\" {
} }
function fun_f_10() -> var__5 { function fun_f_10() -> var__5 {
/// @src 0:91,156 /// @src 0:91:156
/// @src 0:127,134 /// @src 0:127:134
let zero_t_bytes32_1 := zero_value_for_split_t_bytes32() let zero_t_bytes32_1 := zero_value_for_split_t_bytes32()
var__5 := zero_t_bytes32_1 var__5 := zero_t_bytes32_1
/// @src 0:138,153 /// @src 0:138:153
var__5 := convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_bytes32() var__5 := convert_t_stringliteral_9f0adad0a59b05d2e04a1373342b10b9eb16c57c164c8a3bfcbf46dccee39a21_to_t_bytes32()
leave leave

14
test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
View File

@ -8,7 +8,7 @@
object \"C_11\" { object \"C_11\" {
code { code {
/// @src 0:78,159 /// @src 0:78:159
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -25,7 +25,7 @@ object \"C_11\" {
function constructor_C_11() { function constructor_C_11() {
/// @src 0:78,159 /// @src 0:78:159
} }
@ -36,7 +36,7 @@ object \"C_11\" {
} }
object \"C_11_deployed\" { object \"C_11_deployed\" {
code { code {
/// @src 0:78,159 /// @src 0:78:159
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -94,14 +94,14 @@ object \"C_11\" {
} }
function fun_f_10() -> var__5 { function fun_f_10() -> var__5 {
/// @src 0:91,157 /// @src 0:91:157
/// @src 0:127,133 /// @src 0:127:133
let zero_t_bytes4_1 := zero_value_for_split_t_bytes4() let zero_t_bytes4_1 := zero_value_for_split_t_bytes4()
var__5 := zero_t_bytes4_1 var__5 := zero_t_bytes4_1
/// @src 0:144,154 /// @src 0:144:154
let expr_7 := 0x61626364 let expr_7 := 0x61626364
/// @src 0:137,154 /// @src 0:137:154
var__5 := convert_t_rational_1633837924_by_1_to_t_bytes4(expr_7) var__5 := convert_t_rational_1633837924_by_1_to_t_bytes4(expr_7)
leave leave

12
test/cmdlineTests/yul_string_format_ascii_long/output.json
View File

@ -8,7 +8,7 @@
object \"C_11\" { object \"C_11\" {
code { code {
/// @src 0:78,243 /// @src 0:78:243
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -25,7 +25,7 @@ object \"C_11\" {
function constructor_C_11() { function constructor_C_11() {
/// @src 0:78,243 /// @src 0:78:243
} }
@ -36,7 +36,7 @@ object \"C_11\" {
} }
object \"C_11_deployed\" { object \"C_11_deployed\" {
code { code {
/// @src 0:78,243 /// @src 0:78:243
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -150,12 +150,12 @@ object \"C_11\" {
} }
function fun_f_10() -> var__5_mpos { function fun_f_10() -> var__5_mpos {
/// @src 0:91,241 /// @src 0:91:241
/// @src 0:127,140 /// @src 0:127:140
let zero_t_string_memory_ptr_1_mpos := zero_value_for_split_t_string_memory_ptr() let zero_t_string_memory_ptr_1_mpos := zero_value_for_split_t_string_memory_ptr()
var__5_mpos := zero_t_string_memory_ptr_1_mpos var__5_mpos := zero_t_string_memory_ptr_1_mpos
/// @src 0:144,238 /// @src 0:144:238
var__5_mpos := convert_t_stringliteral_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571_to_t_string_memory_ptr() var__5_mpos := convert_t_stringliteral_d6604f85ac07e2b33103a620b3d3d75b0473c7214912beded67b9b624d41c571_to_t_string_memory_ptr()
leave leave

14
test/cmdlineTests/yul_string_format_hex/output.json
View File

@ -8,7 +8,7 @@
object \"C_11\" { object \"C_11\" {
code { code {
/// @src 0:78,159 /// @src 0:78:159
mstore(64, 128) mstore(64, 128)
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
@ -25,7 +25,7 @@ object \"C_11\" {
function constructor_C_11() { function constructor_C_11() {
/// @src 0:78,159 /// @src 0:78:159
} }
@ -36,7 +36,7 @@ object \"C_11\" {
} }
object \"C_11_deployed\" { object \"C_11_deployed\" {
code { code {
/// @src 0:78,159 /// @src 0:78:159
mstore(64, 128) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
@ -94,14 +94,14 @@ object \"C_11\" {
} }
function fun_f_10() -> var__5 { function fun_f_10() -> var__5 {
/// @src 0:91,157 /// @src 0:91:157
/// @src 0:127,133 /// @src 0:127:133
let zero_t_bytes4_1 := zero_value_for_split_t_bytes4() let zero_t_bytes4_1 := zero_value_for_split_t_bytes4()
var__5 := zero_t_bytes4_1 var__5 := zero_t_bytes4_1
/// @src 0:144,154 /// @src 0:144:154
let expr_7 := 0xaabbccdd let expr_7 := 0xaabbccdd
/// @src 0:137,154 /// @src 0:137:154
var__5 := convert_t_rational_2864434397_by_1_to_t_bytes4(expr_7) var__5 := convert_t_rational_2864434397_by_1_to_t_bytes4(expr_7)
leave leave