fix IR

Author: BobTheBuidler

mypyc/test-data/irbuild-lists.test

@@ -594,27 +594,31 @@ def test():
     r3 :: list
     r4 :: native_int
     r5 :: bit
-    r6, x, r7 :: str
-    r8 :: native_int
+    r6 :: native_int
+    r7 :: bit
+    r8, x, r9 :: str
+    r10 :: native_int
     a :: list
 L0:
     r0 = 'abc'
     source = r0
     r1 = CPyStr_Size_size_t(source)
     r2 = r1 >= 0 :: signed
     r3 = PyList_New(r1)
-    r4 = 0
+    r4 = CPyStr_Size_size_t(source)
+    r5 = r4 >= 0 :: signed
+    r6 = 0
 L1:
-    r5 = r4 < r1 :: signed
-    if r5 goto L2 else goto L4 :: bool
+    r7 = r6 < r4 :: signed
+    if r7 goto L2 else goto L4 :: bool
 L2:
-    r6 = CPyStr_GetItemUnsafe(source, r4)
-    x = r6
-    r7 = f2(x)
-    CPyList_SetItemUnsafe(r3, r4, r7)
+    r8 = CPyStr_GetItemUnsafe(source, r6)
+    x = r8
+    r9 = f2(x)
+    CPyList_SetItemUnsafe(r3, r6, r9)
 L3:
-    r8 = r4 + 1
-    r4 = r8
+    r10 = r6 + 1
+    r6 = r10
     goto L1
 L4:
     a = r3
@@ -635,30 +639,38 @@ L0:
     return r1
 def test():
     r0 :: str
-    r1 :: list
-    r2 :: native_int
-    r3 :: bit
-    r4, x, r5 :: str
+    r1 :: native_int
+    r2 :: bit
+    r3 :: list
+    r4 :: native_int
+    r5 :: bit
     r6 :: native_int
+    r7 :: bit
+    r8, x, r9 :: str
+    r10 :: native_int
     a :: list
 L0:
     r0 = 'abc'
-    r1 = PyList_New(3)
-    r2 = 0
+    r1 = CPyStr_Size_size_t(r0)
+    r2 = r1 >= 0 :: signed
+    r3 = PyList_New(r1)
+    r4 = CPyStr_Size_size_t(r0)
+    r5 = r4 >= 0 :: signed
+    r6 = 0
 L1:
-    r3 = r2 < 3 :: signed
-    if r3 goto L2 else goto L4 :: bool
+    r7 = r6 < r4 :: signed
+    if r7 goto L2 else goto L4 :: bool
 L2:
-    r4 = CPyStr_GetItemUnsafe(r0, r2)
-    x = r4
-    r5 = f2(x)
-    CPyList_SetItemUnsafe(r1, r2, r5)
+    r8 = CPyStr_GetItemUnsafe(r0, r6)
+    x = r8
+    r9 = f2(x)
+    CPyList_SetItemUnsafe(r3, r6, r9)
 L3:
-    r6 = r2 + 1
-    r2 = r6
+    r10 = r6 + 1
+    r6 = r10
     goto L1
 L4:
-    a = r1
+    a = r3
     return 1
 
 [case testListBuiltFromFinalStr]
@@ -680,30 +692,38 @@ L0:
     return r1
 def test():
     r0 :: str
-    r1 :: list
-    r2 :: native_int
-    r3 :: bit
-    r4, x, r5 :: str
+    r1 :: native_int
+    r2 :: bit
+    r3 :: list
+    r4 :: native_int
+    r5 :: bit
     r6 :: native_int
+    r7 :: bit
+    r8, x, r9 :: str
+    r10 :: native_int
     a :: list
 L0:
     r0 = 'abc'
-    r1 = PyList_New(3)
-    r2 = 0
+    r1 = CPyStr_Size_size_t(r0)
+    r2 = r1 >= 0 :: signed
+    r3 = PyList_New(r1)
+    r4 = CPyStr_Size_size_t(r0)
+    r5 = r4 >= 0 :: signed
+    r6 = 0
 L1:
-    r3 = r2 < 3 :: signed
-    if r3 goto L2 else goto L4 :: bool
+    r7 = r6 < r4 :: signed
+    if r7 goto L2 else goto L4 :: bool
 L2:
-    r4 = CPyStr_GetItemUnsafe(r0, r2)
-    x = r4
-    r5 = f2(x)
-    CPyList_SetItemUnsafe(r1, r2, r5)
+    r8 = CPyStr_GetItemUnsafe(r0, r6)
+    x = r8
+    r9 = f2(x)
+    CPyList_SetItemUnsafe(r3, r6, r9)
 L3:
-    r6 = r2 + 1
-    r2 = r6
+    r10 = r6 + 1
+    r6 = r10
     goto L1
 L4:
-    a = r1
+    a = r3
     return 1
 
 [case testListBuiltFromBytes_64bit]
@@ -724,47 +744,48 @@ def test():
     r0, source :: bytes
     r1 :: native_int
     r2 :: list
-    r3 :: native_int
-    r4, r5, r6 :: bit
-    r7, r8, r9, r10 :: int
-    r11 :: object
-    r12, x, r13 :: int
-    r14 :: object
-    r15 :: native_int
+    r3, r4 :: native_int
+    r5, r6, r7 :: bit
+    r8, r9, r10, r11 :: int
+    r12 :: object
+    r13, x, r14 :: int
+    r15 :: object
+    r16 :: native_int
     a :: list
 L0:
     r0 = b'abc'
     source = r0
     r1 = var_object_size source
     r2 = PyList_New(r1)
-    r3 = 0
+    r3 = var_object_size source
+    r4 = 0
 L1:
-    r4 = r3 < r1 :: signed
-    if r4 goto L2 else goto L8 :: bool
+    r5 = r4 < r3 :: signed
+    if r5 goto L2 else goto L8 :: bool
 L2:
-    r5 = r3 <= 4611686018427387903 :: signed
-    if r5 goto L3 else goto L4 :: bool
+    r6 = r4 <= 4611686018427387903 :: signed
+    if r6 goto L3 else goto L4 :: bool
 L3:
-    r6 = r3 >= -4611686018427387904 :: signed
-    if r6 goto L5 else goto L4 :: bool
+    r7 = r4 >= -4611686018427387904 :: signed
+    if r7 goto L5 else goto L4 :: bool
 L4:
-    r7 = CPyTagged_FromInt64(r3)
-    r8 = r7
+    r8 = CPyTagged_FromInt64(r4)
+    r9 = r8
     goto L6
 L5:
-    r9 = r3 << 1
-    r8 = r9
+    r10 = r4 << 1
+    r9 = r10
 L6:
-    r10 = CPyBytes_GetItem(source, r8)
-    r11 = box(int, r10)
-    r12 = unbox(int, r11)
-    x = r12
-    r13 = f2(x)
-    r14 = box(int, r13)
-    CPyList_SetItemUnsafe(r2, r3, r14)
+    r11 = CPyBytes_GetItem(source, r9)
+    r12 = box(int, r11)
+    r13 = unbox(int, r12)
+    x = r13
+    r14 = f2(x)
+    r15 = box(int, r14)
+    CPyList_SetItemUnsafe(r2, r4, r15)
 L7:
-    r15 = r3 + 1
-    r3 = r15
+    r16 = r4 + 1
+    r4 = r16
     goto L1
 L8:
     a = r2
@@ -785,49 +806,52 @@ L0:
     return r0
 def test():
     r0 :: bytes
-    r1 :: list
-    r2 :: native_int
-    r3, r4, r5 :: bit
-    r6, r7, r8, r9 :: int
-    r10 :: object
-    r11, x, r12 :: int
-    r13 :: object
-    r14 :: native_int
+    r1 :: native_int
+    r2 :: list
+    r3, r4 :: native_int
+    r5, r6, r7 :: bit
+    r8, r9, r10, r11 :: int
+    r12 :: object
+    r13, x, r14 :: int
+    r15 :: object
+    r16 :: native_int
     a :: list
 L0:
     r0 = b'abc'
-    r1 = PyList_New(3)
-    r2 = 0
+    r1 = var_object_size r0
+    r2 = PyList_New(r1)
+    r3 = var_object_size r0
+    r4 = 0
 L1:
-    r3 = r2 < 3 :: signed
-    if r3 goto L2 else goto L8 :: bool
+    r5 = r4 < r3 :: signed
+    if r5 goto L2 else goto L8 :: bool
 L2:
-    r4 = r2 <= 4611686018427387903 :: signed
-    if r4 goto L3 else goto L4 :: bool
+    r6 = r4 <= 4611686018427387903 :: signed
+    if r6 goto L3 else goto L4 :: bool
 L3:
-    r5 = r2 >= -4611686018427387904 :: signed
-    if r5 goto L5 else goto L4 :: bool
+    r7 = r4 >= -4611686018427387904 :: signed
+    if r7 goto L5 else goto L4 :: bool
 L4:
-    r6 = CPyTagged_FromInt64(r2)
-    r7 = r6
+    r8 = CPyTagged_FromInt64(r4)
+    r9 = r8
     goto L6
 L5:
-    r8 = r2 << 1
-    r7 = r8
+    r10 = r4 << 1
+    r9 = r10
 L6:
-    r9 = CPyBytes_GetItem(r0, r7)
-    r10 = box(int, r9)
-    r11 = unbox(int, r10)
-    x = r11
-    r12 = f2(x)
-    r13 = box(int, r12)
-    CPyList_SetItemUnsafe(r1, r2, r13)
+    r11 = CPyBytes_GetItem(r0, r9)
+    r12 = box(int, r11)
+    r13 = unbox(int, r12)
+    x = r13
+    r14 = f2(x)
+    r15 = box(int, r14)
+    CPyList_SetItemUnsafe(r2, r4, r15)
 L7:
-    r14 = r2 + 1
-    r2 = r14
+    r16 = r4 + 1
+    r4 = r16
     goto L1
 L8:
-    a = r1
+    a = r2
     return 1
 
 [case testListBuiltFromFinalBytes_64bit]
@@ -852,13 +876,13 @@ def test():
     r1 :: bool
     r2 :: native_int
     r3 :: list
-    r4 :: native_int
-    r5, r6, r7 :: bit
-    r8, r9, r10, r11 :: int
-    r12 :: object
-    r13, x, r14 :: int
-    r15 :: object
-    r16 :: native_int
+    r4, r5 :: native_int
+    r6, r7, r8 :: bit
+    r9, r10, r11, r12 :: int
+    r13 :: object
+    r14, x, r15 :: int
+    r16 :: object
+    r17 :: native_int
     a :: list
 L0:
     r0 = __main__.source :: static
@@ -869,35 +893,37 @@ L1:
 L2:
     r2 = var_object_size r0
     r3 = PyList_New(r2)
-    r4 = 0
+    r4 = var_object_size r0
+    r5 = 0
 L3:
-    r5 = r4 < r2 :: signed
-    if r5 goto L4 else goto L10 :: bool
+    r6 = r5 < r4 :: signed
+    if r6 goto L4 else goto L10 :: bool
 L4:
-    r6 = r4 <= 4611686018427387903 :: signed
-    if r6 goto L5 else goto L6 :: bool
+    r7 = r5 <= 4611686018427387903 :: signed
+    if r7 goto L5 else goto L6 :: bool
 L5:
-    r7 = r4 >= -4611686018427387904 :: signed
-    if r7 goto L7 else goto L6 :: bool
+    r8 = r5 >= -4611686018427387904 :: signed
+    if r8 goto L7 else goto L6 :: bool
 L6:
-    r8 = CPyTagged_FromInt64(r4)
-    r9 = r8
+    r9 = CPyTagged_FromInt64(r5)
+    r10 = r9
     goto L8
 L7:
-    r10 = r4 << 1
-    r9 = r10
+    r11 = r5 << 1
+    r10 = r11
 L8:
-    r11 = CPyBytes_GetItem(r0, r9)
-    r12 = box(int, r11)
-    r13 = unbox(int, r12)
-    x = r13
-    r14 = f2(x)
-    r15 = box(int, r14)
-    CPyList_SetItemUnsafe(r3, r4, r15)
+    r12 = CPyBytes_GetItem(r0, r10)
+    r13 = box(int, r12)
+    r14 = unbox(int, r13)
+    x = r14
+    r15 = f2(x)
+    r16 = box(int, r15)
+    CPyList_SetItemUnsafe(r3, r5, r16)
 L9:
-    r16 = r4 + 1
-    r4 = r16
+    r17 = r5 + 1
+    r5 = r17
     goto L3
 L10:
     a = r3
     return 1
+