Skip to content

Commit c7a6346

Browse files
committed
adapt ir to master
1 parent 38539e5 commit c7a6346

File tree

3 files changed

+155
-162
lines changed

3 files changed

+155
-162
lines changed

mypyc/test-data/irbuild-frozenset.test

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@ def fn():
201201
r6, abc :: tuple
202202
r7 :: native_int
203203
r8 :: list
204-
r9, r10 :: native_int
205-
r11 :: bit
206-
r12 :: object
207-
r13, i :: int
208-
r14 :: str
209-
r15 :: native_int
210-
r16 :: frozenset
204+
r9 :: native_int
205+
r10 :: bit
206+
r11 :: object
207+
r12, i :: int
208+
r13 :: str
209+
r14 :: native_int
210+
r15 :: frozenset
211211
L0:
212212
r0 = load_address PyRange_Type
213213
r1 = object 3
@@ -220,24 +220,23 @@ L0:
220220
abc = r6
221221
r7 = var_object_size abc
222222
r8 = PyList_New(r7)
223-
r9 = var_object_size abc
224-
r10 = 0
223+
r9 = 0
225224
L1:
226-
r11 = r10 < r9 :: signed
227-
if r11 goto L2 else goto L4 :: bool
225+
r10 = r9 < r7 :: signed
226+
if r10 goto L2 else goto L4 :: bool
228227
L2:
229-
r12 = CPySequenceTuple_GetItemUnsafe(abc, r10)
230-
r13 = unbox(int, r12)
231-
i = r13
232-
r14 = CPyTagged_Str(i)
233-
CPyList_SetItemUnsafe(r8, r10, r14)
228+
r11 = CPySequenceTuple_GetItemUnsafe(abc, r9)
229+
r12 = unbox(int, r11)
230+
i = r12
231+
r13 = CPyTagged_Str(i)
232+
CPyList_SetItemUnsafe(r8, r9, r13)
234233
L3:
235-
r15 = r10 + 1
236-
r10 = r15
234+
r14 = r9 + 1
235+
r9 = r14
237236
goto L1
238237
L4:
239-
r16 = PyFrozenSet_New(r8)
240-
return r16
238+
r15 = PyFrozenSet_New(r8)
239+
return r15
241240

242241
[case testFrozenSetFromRange5]
243242
from typing import FrozenSet
@@ -254,13 +253,13 @@ def fn():
254253
r7, abc :: tuple
255254
r8 :: native_int
256255
r9 :: list
257-
r10, r11 :: native_int
258-
r12 :: bit
259-
r13 :: object
260-
r14, i :: int
261-
r15 :: str
262-
r16 :: native_int
263-
r17 :: frozenset
256+
r10 :: native_int
257+
r11 :: bit
258+
r12 :: object
259+
r13, i :: int
260+
r14 :: str
261+
r15 :: native_int
262+
r16 :: frozenset
264263
L0:
265264
r0 = load_address PyRange_Type
266265
r1 = object 1
@@ -274,24 +273,23 @@ L0:
274273
abc = r7
275274
r8 = var_object_size abc
276275
r9 = PyList_New(r8)
277-
r10 = var_object_size abc
278-
r11 = 0
276+
r10 = 0
279277
L1:
280-
r12 = r11 < r10 :: signed
281-
if r12 goto L2 else goto L4 :: bool
278+
r11 = r10 < r8 :: signed
279+
if r11 goto L2 else goto L4 :: bool
282280
L2:
283-
r13 = CPySequenceTuple_GetItemUnsafe(abc, r11)
284-
r14 = unbox(int, r13)
285-
i = r14
286-
r15 = CPyTagged_Str(i)
287-
CPyList_SetItemUnsafe(r9, r11, r15)
281+
r12 = CPySequenceTuple_GetItemUnsafe(abc, r10)
282+
r13 = unbox(int, r12)
283+
i = r13
284+
r14 = CPyTagged_Str(i)
285+
CPyList_SetItemUnsafe(r9, r10, r14)
288286
L3:
289-
r16 = r11 + 1
290-
r11 = r16
287+
r15 = r10 + 1
288+
r10 = r15
291289
goto L1
292290
L4:
293-
r17 = PyFrozenSet_New(r9)
294-
return r17
291+
r16 = PyFrozenSet_New(r9)
292+
return r16
295293

296294
[case testFrozenSetFromRange6]
297295
from typing import FrozenSet
@@ -308,13 +306,13 @@ def fn():
308306
r8, abc :: tuple
309307
r9 :: native_int
310308
r10 :: list
311-
r11, r12 :: native_int
312-
r13 :: bit
313-
r14 :: object
314-
r15, i :: int
315-
r16 :: str
316-
r17 :: native_int
317-
r18 :: frozenset
309+
r11 :: native_int
310+
r12 :: bit
311+
r13 :: object
312+
r14, i :: int
313+
r15 :: str
314+
r16 :: native_int
315+
r17 :: frozenset
318316
L0:
319317
r0 = load_address PyRange_Type
320318
r1 = object 1
@@ -329,21 +327,21 @@ L0:
329327
abc = r8
330328
r9 = var_object_size abc
331329
r10 = PyList_New(r9)
332-
r11 = var_object_size abc
333-
r12 = 0
330+
r11 = 0
334331
L1:
335-
r13 = r12 < r11 :: signed
336-
if r13 goto L2 else goto L4 :: bool
332+
r12 = r11 < r9 :: signed
333+
if r12 goto L2 else goto L4 :: bool
337334
L2:
338-
r14 = CPySequenceTuple_GetItemUnsafe(abc, r12)
339-
r15 = unbox(int, r14)
340-
i = r15
341-
r16 = CPyTagged_Str(i)
342-
CPyList_SetItemUnsafe(r10, r12, r16)
335+
r13 = CPySequenceTuple_GetItemUnsafe(abc, r11)
336+
r14 = unbox(int, r13)
337+
i = r14
338+
r15 = CPyTagged_Str(i)
339+
CPyList_SetItemUnsafe(r10, r11, r15)
343340
L3:
344-
r17 = r12 + 1
345-
r12 = r17
341+
r16 = r11 + 1
342+
r11 = r16
346343
goto L1
347344
L4:
348-
r18 = PyFrozenSet_New(r10)
349-
return r18
345+
r17 = PyFrozenSet_New(r10)
346+
return r17
347+

mypyc/test-data/irbuild-lists.test

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,12 +1052,12 @@ def fn():
10521052
r6, abc :: tuple
10531053
r7 :: native_int
10541054
r8 :: list
1055-
r9, r10 :: native_int
1056-
r11 :: bit
1057-
r12 :: object
1058-
r13, i :: int
1059-
r14 :: str
1060-
r15 :: native_int
1055+
r9 :: native_int
1056+
r10 :: bit
1057+
r11 :: object
1058+
r12, i :: int
1059+
r13 :: str
1060+
r14 :: native_int
10611061
L0:
10621062
r0 = load_address PyRange_Type
10631063
r1 = object 3
@@ -1070,20 +1070,19 @@ L0:
10701070
abc = r6
10711071
r7 = var_object_size abc
10721072
r8 = PyList_New(r7)
1073-
r9 = var_object_size abc
1074-
r10 = 0
1073+
r9 = 0
10751074
L1:
1076-
r11 = r10 < r9 :: signed
1077-
if r11 goto L2 else goto L4 :: bool
1075+
r10 = r9 < r7 :: signed
1076+
if r10 goto L2 else goto L4 :: bool
10781077
L2:
1079-
r12 = CPySequenceTuple_GetItemUnsafe(abc, r10)
1080-
r13 = unbox(int, r12)
1081-
i = r13
1082-
r14 = CPyTagged_Str(i)
1083-
CPyList_SetItemUnsafe(r8, r10, r14)
1078+
r11 = CPySequenceTuple_GetItemUnsafe(abc, r9)
1079+
r12 = unbox(int, r11)
1080+
i = r12
1081+
r13 = CPyTagged_Str(i)
1082+
CPyList_SetItemUnsafe(r8, r9, r13)
10841083
L3:
1085-
r15 = r10 + 1
1086-
r10 = r15
1084+
r14 = r9 + 1
1085+
r9 = r14
10871086
goto L1
10881087
L4:
10891088
return r8
@@ -1102,12 +1101,12 @@ def fn():
11021101
r7, abc :: tuple
11031102
r8 :: native_int
11041103
r9 :: list
1105-
r10, r11 :: native_int
1106-
r12 :: bit
1107-
r13 :: object
1108-
r14, i :: int
1109-
r15 :: str
1110-
r16 :: native_int
1104+
r10 :: native_int
1105+
r11 :: bit
1106+
r12 :: object
1107+
r13, i :: int
1108+
r14 :: str
1109+
r15 :: native_int
11111110
L0:
11121111
r0 = load_address PyRange_Type
11131112
r1 = object 1
@@ -1121,20 +1120,19 @@ L0:
11211120
abc = r7
11221121
r8 = var_object_size abc
11231122
r9 = PyList_New(r8)
1124-
r10 = var_object_size abc
1125-
r11 = 0
1123+
r10 = 0
11261124
L1:
1127-
r12 = r11 < r10 :: signed
1128-
if r12 goto L2 else goto L4 :: bool
1125+
r11 = r10 < r8 :: signed
1126+
if r11 goto L2 else goto L4 :: bool
11291127
L2:
1130-
r13 = CPySequenceTuple_GetItemUnsafe(abc, r11)
1131-
r14 = unbox(int, r13)
1132-
i = r14
1133-
r15 = CPyTagged_Str(i)
1134-
CPyList_SetItemUnsafe(r9, r11, r15)
1128+
r12 = CPySequenceTuple_GetItemUnsafe(abc, r10)
1129+
r13 = unbox(int, r12)
1130+
i = r13
1131+
r14 = CPyTagged_Str(i)
1132+
CPyList_SetItemUnsafe(r9, r10, r14)
11351133
L3:
1136-
r16 = r11 + 1
1137-
r11 = r16
1134+
r15 = r10 + 1
1135+
r10 = r15
11381136
goto L1
11391137
L4:
11401138
return r9
@@ -1153,12 +1151,12 @@ def fn():
11531151
r8, abc :: tuple
11541152
r9 :: native_int
11551153
r10 :: list
1156-
r11, r12 :: native_int
1157-
r13 :: bit
1158-
r14 :: object
1159-
r15, i :: int
1160-
r16 :: str
1161-
r17 :: native_int
1154+
r11 :: native_int
1155+
r12 :: bit
1156+
r13 :: object
1157+
r14, i :: int
1158+
r15 :: str
1159+
r16 :: native_int
11621160
L0:
11631161
r0 = load_address PyRange_Type
11641162
r1 = object 1
@@ -1173,20 +1171,20 @@ L0:
11731171
abc = r8
11741172
r9 = var_object_size abc
11751173
r10 = PyList_New(r9)
1176-
r11 = var_object_size abc
1177-
r12 = 0
1174+
r11 = 0
11781175
L1:
1179-
r13 = r12 < r11 :: signed
1180-
if r13 goto L2 else goto L4 :: bool
1176+
r12 = r11 < r9 :: signed
1177+
if r12 goto L2 else goto L4 :: bool
11811178
L2:
1182-
r14 = CPySequenceTuple_GetItemUnsafe(abc, r12)
1183-
r15 = unbox(int, r14)
1184-
i = r15
1185-
r16 = CPyTagged_Str(i)
1186-
CPyList_SetItemUnsafe(r10, r12, r16)
1179+
r13 = CPySequenceTuple_GetItemUnsafe(abc, r11)
1180+
r14 = unbox(int, r13)
1181+
i = r14
1182+
r15 = CPyTagged_Str(i)
1183+
CPyList_SetItemUnsafe(r10, r11, r15)
11871184
L3:
1188-
r17 = r12 + 1
1189-
r12 = r17
1185+
r16 = r11 + 1
1186+
r11 = r16
11901187
goto L1
11911188
L4:
11921189
return r10
1190+

0 commit comments

Comments
 (0)