Skip to content

Commit e9592c3

Browse files
chrisethchriseth
committed
Update tests.
1 parent 106921c commit e9592c3

File tree

99 files changed

+952
-859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+952
-859
lines changed

‎test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,7 @@ object "C_6" {
108108
{
109109
// f()
110110

111-
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
112-
abi_decode_tuple_(4, calldatasize())
113-
fun_f_5()
114-
let memPos := allocate_unbounded()
115-
let memEnd := abi_encode_tuple__to__fromStack(memPos )
116-
return(memPos, sub(memEnd, memPos))
111+
external_fun_f_5()
117112
}
118113

119114
default {}
@@ -150,6 +145,17 @@ object "C_6" {
150145

151146
}
152147

148+
function external_fun_f_5() {
149+
150+
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
151+
abi_decode_tuple_(4, calldatasize())
152+
fun_f_5()
153+
let memPos := allocate_unbounded()
154+
let memEnd := abi_encode_tuple__to__fromStack(memPos )
155+
return(memPos, sub(memEnd, memPos))
156+
157+
}
158+
153159
function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
154160
revert(0, 0)
155161
}

‎test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,7 @@ object "C_6" {
108108
{
109109
// f()
110110

111-
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
112-
abi_decode_tuple_(4, calldatasize())
113-
fun_f_5()
114-
let memPos := allocate_unbounded()
115-
let memEnd := abi_encode_tuple__to__fromStack(memPos )
116-
return(memPos, sub(memEnd, memPos))
111+
external_fun_f_5()
117112
}
118113

119114
default {}
@@ -150,6 +145,17 @@ object "C_6" {
150145

151146
}
152147

148+
function external_fun_f_5() {
149+
150+
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
151+
abi_decode_tuple_(4, calldatasize())
152+
fun_f_5()
153+
let memPos := allocate_unbounded()
154+
let memEnd := abi_encode_tuple__to__fromStack(memPos )
155+
return(memPos, sub(memEnd, memPos))
156+
157+
}
158+
153159
function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
154160
revert(0, 0)
155161
}

‎test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,7 @@ object "C_6" {
101101
{
102102
// f()
103103

104-
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
105-
abi_decode_tuple_(4, calldatasize())
106-
fun_f_5()
107-
let memPos := allocate_unbounded()
108-
let memEnd := abi_encode_tuple__to__fromStack(memPos )
109-
return(memPos, sub(memEnd, memPos))
104+
external_fun_f_5()
110105
}
111106

112107
default {}
@@ -143,6 +138,17 @@ object "C_6" {
143138

144139
}
145140

141+
function external_fun_f_5() {
142+
143+
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
144+
abi_decode_tuple_(4, calldatasize())
145+
fun_f_5()
146+
let memPos := allocate_unbounded()
147+
let memEnd := abi_encode_tuple__to__fromStack(memPos )
148+
return(memPos, sub(memEnd, memPos))
149+
150+
}
151+
146152
function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
147153
revert(0, 0)
148154
}

‎test/cmdlineTests/debug_info_in_yul_snippet_escaping/output

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,7 @@ object "D_27" {
158158
{
159159
// f()
160160

161-
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
162-
abi_decode_tuple_(4, calldatasize())
163-
let ret_0 := fun_f_26()
164-
let memPos := allocate_unbounded()
165-
let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
166-
return(memPos, sub(memEnd, memPos))
161+
external_fun_f_26()
167162
}
168163

169164
default {}
@@ -238,6 +233,17 @@ object "D_27" {
238233

239234
}
240235

236+
function external_fun_f_26() {
237+
238+
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
239+
abi_decode_tuple_(4, calldatasize())
240+
let ret_0 := fun_f_26()
241+
let memPos := allocate_unbounded()
242+
let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
243+
return(memPos, sub(memEnd, memPos))
244+
245+
}
246+
241247
function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
242248
revert(0, 0)
243249
}
@@ -484,7 +490,7 @@ object "D_27" {
484490
revert(pos, returndatasize())
485491
}
486492
mstore(add(allocate_memory_array_string(), 32), "/*")
487-
let memPtr := allocate_memory_array_string_480()
493+
let memPtr := allocate_memory_array_string_546()
488494
mstore(add(memPtr, 32), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
489495
mstore(add(memPtr, 64), shl(200, 0x2e2e2e22202a2f))
490496
let memPos := mload(64)
@@ -525,7 +531,7 @@ object "D_27" {
525531
memPtr := memPtr_1
526532
mstore(memPtr_1, 2)
527533
}
528-
function allocate_memory_array_string_480() -> memPtr
534+
function allocate_memory_array_string_546() -> memPtr
529535
{
530536
let memPtr_1 := mload(64)
531537
let newFreePtr := add(memPtr_1, 96)

‎test/cmdlineTests/exp_base_literal/output

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ object "C_81" {
5353
{
5454
// f(uint256,uint256,uint256,uint256)
5555

56-
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
57-
let param_0, param_1, param_2, param_3 := abi_decode_tuple_t_uint256t_uint256t_uint256t_uint256(4, calldatasize())
58-
let ret_0, ret_1, ret_2, ret_3 := fun_f_80(param_0, param_1, param_2, param_3)
59-
let memPos := allocate_unbounded()
60-
let memEnd := abi_encode_tuple_t_uint256_t_int256_t_uint256_t_uint256__to_t_uint256_t_int256_t_uint256_t_uint256__fromStack(memPos , ret_0, ret_1, ret_2, ret_3)
61-
return(memPos, sub(memEnd, memPos))
56+
external_fun_f_80()
6257
}
6358

6459
default {}
@@ -160,6 +155,17 @@ object "C_81" {
160155

161156
}
162157

158+
function external_fun_f_80() {
159+
160+
if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
161+
let param_0, param_1, param_2, param_3 := abi_decode_tuple_t_uint256t_uint256t_uint256t_uint256(4, calldatasize())
162+
let ret_0, ret_1, ret_2, ret_3 := fun_f_80(param_0, param_1, param_2, param_3)
163+
let memPos := allocate_unbounded()
164+
let memEnd := abi_encode_tuple_t_uint256_t_int256_t_uint256_t_uint256__to_t_uint256_t_int256_t_uint256_t_uint256__fromStack(memPos , ret_0, ret_1, ret_2, ret_3)
165+
return(memPos, sub(memEnd, memPos))
166+
167+
}
168+
163169
function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
164170
revert(0, 0)
165171
}

‎test/cmdlineTests/inline_assembly_function_name_clash/output

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,157 +7,169 @@
77
{
88
"abi_decode_tuple_":
99
{
10-
"entryPoint": 216,
10+
"entryPoint": 122,
1111
"parameterSlots": 2,
1212
"returnSlots": 0
1313
},
1414
"abi_encode_t_uint256_to_t_uint256_fromStack":
1515
{
16-
"entryPoint": 250,
16+
"entryPoint": 156,
1717
"parameterSlots": 2,
1818
"returnSlots": 0
1919
},
2020
"abi_encode_tuple_t_uint256__to_t_uint256__fromStack":
2121
{
22-
"entryPoint": 265,
22+
"entryPoint": 171,
2323
"parameterSlots": 2,
2424
"returnSlots": 1
2525
},
2626
"allocate_unbounded":
2727
{
28-
"entryPoint": 196,
28+
"entryPoint": 102,
2929
"parameterSlots": 0,
3030
"returnSlots": 1
3131
},
3232
"cleanup_t_uint256":
3333
{
34-
"entryPoint": 240,
34+
"entryPoint": 146,
3535
"parameterSlots": 1,
3636
"returnSlots": 1
3737
},
3838
"convert_t_uint256_to_t_uint256":
3939
{
40-
"entryPoint": 391,
40+
"entryPoint": 413,
4141
"parameterSlots": 1,
4242
"returnSlots": 1
4343
},
44+
"external_fun_f_25":
45+
{
46+
"entryPoint": 198,
47+
"parameterSlots": 0,
48+
"returnSlots": 0
49+
},
50+
"external_fun_g_36":
51+
{
52+
"entryPoint": 256,
53+
"parameterSlots": 0,
54+
"returnSlots": 0
55+
},
4456
"fun_f_25":
4557
{
46-
"entryPoint": 658,
58+
"entryPoint": 680,
4759
"id": 25,
4860
"parameterSlots": 0,
4961
"returnSlots": 1
5062
},
5163
"fun_f_25_inner":
5264
{
53-
"entryPoint": 624,
65+
"entryPoint": 646,
5466
"parameterSlots": 1,
5567
"returnSlots": 1
5668
},
5769
"fun_g_36":
5870
{
59-
"entryPoint": 874,
71+
"entryPoint": 896,
6072
"id": 36,
6173
"parameterSlots": 0,
6274
"returnSlots": 1
6375
},
6476
"fun_g_36_inner":
6577
{
66-
"entryPoint": 840,
78+
"entryPoint": 862,
6779
"parameterSlots": 1,
6880
"returnSlots": 1
6981
},
7082
"identity":
7183
{
72-
"entryPoint": 381,
84+
"entryPoint": 403,
7385
"parameterSlots": 1,
7486
"returnSlots": 1
7587
},
7688
"modifier_m_17":
7789
{
78-
"entryPoint": 470,
90+
"entryPoint": 492,
7991
"id": 14,
8092
"parameterSlots": 1,
8193
"returnSlots": 1
8294
},
8395
"modifier_m_19":
8496
{
85-
"entryPoint": 547,
97+
"entryPoint": 569,
8698
"id": 14,
8799
"parameterSlots": 1,
88100
"returnSlots": 1
89101
},
90102
"modifier_m_28":
91103
{
92-
"entryPoint": 686,
104+
"entryPoint": 708,
93105
"id": 14,
94106
"parameterSlots": 1,
95107
"returnSlots": 1
96108
},
97109
"modifier_m_30":
98110
{
99-
"entryPoint": 763,
111+
"entryPoint": 785,
100112
"id": 14,
101113
"parameterSlots": 1,
102114
"returnSlots": 1
103115
},
104116
"prepare_store_t_uint256":
105117
{
106-
"entryPoint": 425,
118+
"entryPoint": 447,
107119
"parameterSlots": 1,
108120
"returnSlots": 1
109121
},
110122
"revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74":
111123
{
112-
"entryPoint": 292,
124+
"entryPoint": 314,
113125
"parameterSlots": 0,
114126
"returnSlots": 0
115127
},
116128
"revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb":
117129
{
118-
"entryPoint": 206,
130+
"entryPoint": 112,
119131
"parameterSlots": 0,
120132
"returnSlots": 0
121133
},
122134
"revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
123135
{
124-
"entryPoint": 211,
136+
"entryPoint": 117,
125137
"parameterSlots": 0,
126138
"returnSlots": 0
127139
},
128140
"shift_left_0":
129141
{
130-
"entryPoint": 302,
142+
"entryPoint": 324,
131143
"parameterSlots": 1,
132144
"returnSlots": 1
133145
},
134146
"shift_right_224_unsigned":
135147
{
136-
"entryPoint": 183,
148+
"entryPoint": 89,
137149
"parameterSlots": 1,
138150
"returnSlots": 1
139151
},
140152
"update_byte_slice_32_shift_0":
141153
{
142-
"entryPoint": 315,
154+
"entryPoint": 337,
143155
"parameterSlots": 2,
144156
"returnSlots": 1
145157
},
146158
"update_storage_value_offset_0t_uint256_to_t_uint256":
147159
{
148-
"entryPoint": 435,
160+
"entryPoint": 457,
149161
"parameterSlots": 2,
150162
"returnSlots": 0
151163
},
152164
"usr$f":
153165
{
154-
"entryPoint": 493,
166+
"entryPoint": 515,
155167
"parameterSlots": 0,
156168
"returnSlots": 1
157169
},
158170
"zero_value_for_split_t_uint256":
159171
{
160-
"entryPoint": 297,
172+
"entryPoint": 319,
161173
"parameterSlots": 0,
162174
"returnSlots": 1
163175
}

‎test/cmdlineTests/name_simplifier/output

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ object "C_59" {
5050
for { } lt(src, srcEnd) { src := add(src, _2) }
5151
{
5252
if slt(sub(calldatasize(), src), _2) { revert(_1, _1) }
53-
let value := allocate_memory_1172()
53+
let value := allocate_memory_1307()
5454
mstore(value, calldataload(src))
5555
mstore(dst, value)
5656
dst := add(dst, _2)
@@ -68,7 +68,7 @@ object "C_59" {
6868
mstore(4, 0x41)
6969
revert(0, 0x24)
7070
}
71-
function allocate_memory_1172() -> memPtr
71+
function allocate_memory_1307() -> memPtr
7272
{
7373
memPtr := mload(64)
7474
let newFreePtr := add(memPtr, 32)

0 commit comments

Comments
 (0)