Skip to content

Commit 1d89889

Browse files
clonkerclonker
committed
Update test expectations for numerical label IDs in Yul
1 parent 29db49e commit 1d89889

File tree

193 files changed

+2064
-2177
lines changed

Some content is hidden

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

193 files changed

+2064
-2177
lines changed

‎test/cmdlineTests/ast_ir/output

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ Optimized IR AST:
673673
},
674674
"variables": [
675675
{
676-
"name": "_1",
676+
"name": "_2",
677677
"nativeSrc": "132:2:0",
678678
"nodeType": "YulTypedName",
679679
"src": "60:13:0",
@@ -693,7 +693,7 @@ Optimized IR AST:
693693
"value": "64"
694694
},
695695
{
696-
"name": "_1",
696+
"name": "_2",
697697
"nativeSrc": "179:2:0",
698698
"nodeType": "YulIdentifier",
699699
"src": "60:13:0"
@@ -799,7 +799,7 @@ Optimized IR AST:
799799
},
800800
"variables": [
801801
{
802-
"name": "_2",
802+
"name": "_1",
803803
"nativeSrc": "243:2:0",
804804
"nodeType": "YulTypedName",
805805
"src": "60:13:0",
@@ -811,7 +811,7 @@ Optimized IR AST:
811811
"expression": {
812812
"arguments": [
813813
{
814-
"name": "_1",
814+
"name": "_2",
815815
"nativeSrc": "295:2:0",
816816
"nodeType": "YulIdentifier",
817817
"src": "60:13:0"
@@ -839,7 +839,7 @@ Optimized IR AST:
839839
"src": "60:13:0"
840840
},
841841
{
842-
"name": "_2",
842+
"name": "_1",
843843
"nativeSrc": "327:2:0",
844844
"nodeType": "YulIdentifier",
845845
"src": "60:13:0"
@@ -863,13 +863,13 @@ Optimized IR AST:
863863
"expression": {
864864
"arguments": [
865865
{
866-
"name": "_1",
866+
"name": "_2",
867867
"nativeSrc": "350:2:0",
868868
"nodeType": "YulIdentifier",
869869
"src": "60:13:0"
870870
},
871871
{
872-
"name": "_2",
872+
"name": "_1",
873873
"nativeSrc": "354:2:0",
874874
"nodeType": "YulIdentifier",
875875
"src": "60:13:0"

‎test/cmdlineTests/constant_optimizer_yul/output

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ object "C_12" {
44
code {
55
{
66
/// @src 0:61:418 "contract C {..."
7-
let _1 := memoryguard(0x80)
8-
mstore(64, _1)
7+
let _2 := memoryguard(0x80)
8+
mstore(64, _2)
99
if callvalue() { revert(0, 0) }
1010
/// @src 0:103:238 "assembly {..."
1111
sstore(0, shl(180, 1))
1212
/// @src 0:61:418 "contract C {..."
13-
let _2 := datasize("C_12_deployed")
14-
codecopy(_1, dataoffset("C_12_deployed"), _2)
15-
return(_1, _2)
13+
let _1 := datasize("C_12_deployed")
14+
codecopy(_2, dataoffset("C_12_deployed"), _1)
15+
return(_2, _1)
1616
}
1717
}
1818
/// @use-src 0:"constant_optimizer_yul/input.sol"

‎test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ object "C_6" {
168168
code {
169169
{
170170
/// @src 0:60:101 "contract C {..."
171-
let _1 := memoryguard(0x80)
172-
mstore(64, _1)
171+
let _2 := memoryguard(0x80)
172+
mstore(64, _2)
173173
if callvalue() { revert(0, 0) }
174-
let _2 := datasize("C_6_deployed")
175-
codecopy(_1, dataoffset("C_6_deployed"), _2)
176-
return(_1, _2)
174+
let _1 := datasize("C_6_deployed")
175+
codecopy(_2, dataoffset("C_6_deployed"), _1)
176+
return(_2, _1)
177177
}
178178
}
179179
/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"

‎test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ object "C_6" {
167167
code {
168168
{
169169
/// @src 0:60:101
170-
let _1 := memoryguard(0x80)
171-
mstore(64, _1)
170+
let _2 := memoryguard(0x80)
171+
mstore(64, _2)
172172
if callvalue() { revert(0, 0) }
173-
let _2 := datasize("C_6_deployed")
174-
codecopy(_1, dataoffset("C_6_deployed"), _2)
175-
return(_1, _2)
173+
let _1 := datasize("C_6_deployed")
174+
codecopy(_2, dataoffset("C_6_deployed"), _1)
175+
return(_2, _1)
176176
}
177177
}
178178
/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"

‎test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,12 @@ Optimized IR:
157157
object "C_6" {
158158
code {
159159
{
160-
let _1 := memoryguard(0x80)
161-
mstore(64, _1)
160+
let _2 := memoryguard(0x80)
161+
mstore(64, _2)
162162
if callvalue() { revert(0, 0) }
163-
let _2 := datasize("C_6_deployed")
164-
codecopy(_1, dataoffset("C_6_deployed"), _2)
165-
return(_1, _2)
163+
let _1 := datasize("C_6_deployed")
164+
codecopy(_2, dataoffset("C_6_deployed"), _1)
165+
return(_2, _1)
166166
}
167167
}
168168
/// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"

‎test/cmdlineTests/debug_info_in_yul_snippet_escaping/output

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ object "C_2" {
6868
code {
6969
{
7070
/// @src 0:265:278 "contract C {}"
71-
let _1 := memoryguard(0x80)
72-
mstore(64, _1)
71+
let _2 := memoryguard(0x80)
72+
mstore(64, _2)
7373
if callvalue() { revert(0, 0) }
74-
let _2 := datasize("C_2_deployed")
75-
codecopy(_1, dataoffset("C_2_deployed"), _2)
76-
return(_1, _2)
74+
let _1 := datasize("C_2_deployed")
75+
codecopy(_2, dataoffset("C_2_deployed"), _1)
76+
return(_2, _1)
7777
}
7878
}
7979
/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
@@ -415,12 +415,12 @@ object "D_27" {
415415
code {
416416
{
417417
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
418-
let _1 := memoryguard(0x80)
419-
mstore(64, _1)
418+
let _2 := memoryguard(0x80)
419+
mstore(64, _2)
420420
if callvalue() { revert(0, 0) }
421-
let _2 := datasize("D_27_deployed")
422-
codecopy(_1, dataoffset("D_27_deployed"), _2)
423-
return(_1, _2)
421+
let _1 := datasize("D_27_deployed")
422+
codecopy(_2, dataoffset("D_27_deployed"), _1)
423+
return(_2, _1)
424424
}
425425
}
426426
/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
@@ -504,12 +504,12 @@ object "D_27" {
504504
code {
505505
{
506506
/// @src 0:265:278 "contract C {}"
507-
let _1 := memoryguard(0x80)
508-
mstore(64, _1)
507+
let _2 := memoryguard(0x80)
508+
mstore(64, _2)
509509
if callvalue() { revert(0, 0) }
510-
let _2 := datasize("C_2_deployed")
511-
codecopy(_1, dataoffset("C_2_deployed"), _2)
512-
return(_1, _2)
510+
let _1 := datasize("C_2_deployed")
511+
codecopy(_2, dataoffset("C_2_deployed"), _1)
512+
return(_2, _1)
513513
}
514514
}
515515
/// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"

‎test/cmdlineTests/inline_assembly_function_name_clash/output

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,64 @@
22
"contracts": {
33
"inline_assembly_function_name_clash/input.sol:C": {
44
"function-debug-runtime": {
5-
"abi_decode": {
5+
"abi_decode_tuple_": {
66
"entryPoint": 80,
77
"parameterSlots": 2,
88
"returnSlots": 0
99
},
10-
"abi_encode_uint256": {
11-
"entryPoint": 111,
12-
"parameterSlots": 2,
13-
"returnSlots": 1
14-
},
15-
"abi_encode_uint256_to_uint256": {
10+
"abi_encode_t_uint256_to_t_uint256_fromStack": {
1611
"entryPoint": 98,
1712
"parameterSlots": 2,
1813
"returnSlots": 0
1914
},
15+
"abi_encode_tuple_t_uint256__to_t_uint256__fromStack": {
16+
"entryPoint": 111,
17+
"parameterSlots": 2,
18+
"returnSlots": 1
19+
},
2020
"allocate_unbounded": {
2121
"entryPoint": 66,
2222
"parameterSlots": 0,
2323
"returnSlots": 1
2424
},
25-
"cleanup_uint256": {
25+
"cleanup_t_uint256": {
2626
"entryPoint": 95,
2727
"parameterSlots": 1,
2828
"returnSlots": 1
2929
},
30-
"convert_uint256_to_uint256": {
30+
"convert_t_uint256_to_t_uint256": {
3131
"entryPoint": 276,
3232
"parameterSlots": 1,
3333
"returnSlots": 1
3434
},
35-
"external_fun_f": {
35+
"external_fun_f_25": {
3636
"entryPoint": 132,
3737
"parameterSlots": 0,
3838
"returnSlots": 0
3939
},
40-
"external_fun_g": {
40+
"external_fun_g_36": {
4141
"entryPoint": 185,
4242
"parameterSlots": 0,
4343
"returnSlots": 0
4444
},
45-
"fun_f": {
45+
"fun_f_25": {
4646
"entryPoint": 442,
4747
"id": 25,
4848
"parameterSlots": 0,
4949
"returnSlots": 1
5050
},
51-
"fun_f_inner": {
51+
"fun_f_25_inner": {
5252
"entryPoint": 430,
5353
"parameterSlots": 1,
5454
"returnSlots": 1
5555
},
56-
"fun_g": {
56+
"fun_g_36": {
5757
"entryPoint": 564,
5858
"id": 36,
5959
"parameterSlots": 0,
6060
"returnSlots": 1
6161
},
62-
"fun_g_inner": {
62+
"fun_g_36_inner": {
6363
"entryPoint": 552,
6464
"parameterSlots": 1,
6565
"returnSlots": 1
@@ -69,12 +69,6 @@
6969
"parameterSlots": 1,
7070
"returnSlots": 1
7171
},
72-
"modifier_m": {
73-
"entryPoint": 509,
74-
"id": 14,
75-
"parameterSlots": 1,
76-
"returnSlots": 1
77-
},
7872
"modifier_m_17": {
7973
"entryPoint": 344,
8074
"id": 14,
@@ -93,7 +87,13 @@
9387
"parameterSlots": 1,
9488
"returnSlots": 1
9589
},
96-
"prepare_store_uint256": {
90+
"modifier_m_30": {
91+
"entryPoint": 509,
92+
"id": 14,
93+
"parameterSlots": 1,
94+
"returnSlots": 1
95+
},
96+
"prepare_store_t_uint256": {
9797
"entryPoint": 304,
9898
"parameterSlots": 1,
9999
"returnSlots": 1
@@ -113,22 +113,22 @@
113113
"parameterSlots": 0,
114114
"returnSlots": 0
115115
},
116-
"shift_left": {
116+
"shift_left_0": {
117117
"entryPoint": 246,
118118
"parameterSlots": 1,
119119
"returnSlots": 1
120120
},
121-
"shift_right_unsigned": {
121+
"shift_right_224_unsigned": {
122122
"entryPoint": 60,
123123
"parameterSlots": 1,
124124
"returnSlots": 1
125125
},
126-
"update_byte_slice_shift": {
126+
"update_byte_slice_32_shift_0": {
127127
"entryPoint": 251,
128128
"parameterSlots": 2,
129129
"returnSlots": 1
130130
},
131-
"update_storage_value_offset_uint256_to_uint256": {
131+
"update_storage_value_offset_0_t_uint256_to_t_uint256": {
132132
"entryPoint": 307,
133133
"parameterSlots": 2,
134134
"returnSlots": 0
@@ -138,32 +138,32 @@
138138
"parameterSlots": 0,
139139
"returnSlots": 1
140140
},
141-
"usr$f_17": {
141+
"usr$f_1": {
142142
"entryPoint": 382,
143143
"parameterSlots": 0,
144144
"returnSlots": 1
145145
},
146-
"usr$f_22": {
146+
"usr$f_2": {
147147
"entryPoint": 425,
148148
"parameterSlots": 0,
149149
"returnSlots": 1
150150
},
151-
"usr$f_26": {
151+
"usr$f_3": {
152152
"entryPoint": 461,
153153
"parameterSlots": 0,
154154
"returnSlots": 1
155155
},
156-
"usr$f_32": {
156+
"usr$f_4": {
157157
"entryPoint": 504,
158158
"parameterSlots": 0,
159159
"returnSlots": 1
160160
},
161-
"usr$f_37": {
161+
"usr$f_5": {
162162
"entryPoint": 547,
163163
"parameterSlots": 0,
164164
"returnSlots": 1
165165
},
166-
"zero_value_for_split_uint256": {
166+
"zero_value_for_split_t_uint256": {
167167
"entryPoint": 242,
168168
"parameterSlots": 0,
169169
"returnSlots": 1

‎test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ object "C_7" {
44
code {
55
{
66
/// @src 0:82:117 "contract C {..."
7-
let _1 := memoryguard(0x80)
8-
mstore(64, _1)
7+
let _2 := memoryguard(0x80)
8+
mstore(64, _2)
99
if callvalue() { revert(0, 0) }
10-
let _2 := datasize("C_7_deployed")
11-
codecopy(_1, dataoffset("C_7_deployed"), _2)
12-
return(_1, _2)
10+
let _1 := datasize("C_7_deployed")
11+
codecopy(_2, dataoffset("C_7_deployed"), _1)
12+
return(_2, _1)
1313
}
1414
}
1515
/// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
@@ -30,12 +30,12 @@ object "D_10" {
3030
code {
3131
{
3232
/// @src 0:118:137 "contract D is C {..."
33-
let _1 := memoryguard(0x80)
34-
mstore(64, _1)
33+
let _2 := memoryguard(0x80)
34+
mstore(64, _2)
3535
if callvalue() { revert(0, 0) }
36-
let _2 := datasize("D_10_deployed")
37-
codecopy(_1, dataoffset("D_10_deployed"), _2)
38-
return(_1, _2)
36+
let _1 := datasize("D_10_deployed")
37+
codecopy(_2, dataoffset("D_10_deployed"), _1)
38+
return(_2, _1)
3939
}
4040
}
4141
/// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"

0 commit comments

Comments
 (0)