Fixes all other tests

sobolevn · Sep 23, 2021 · Sep 27, 2021 · Sep 28, 2021 · Oct 9, 2021 · Nov 7, 2021
commit 420d73f40a172ffa84bc54f9c79cac1e35458cfc
diff --git a/mypyc/test-data/irbuild-basic.test b/mypyc/test-data/irbuild-basic.test
@@ -2487,6 +2487,7 @@ x = Lol(1, '')
 Foo = List[int]
 Bar = NewType('Bar', Foo)
 y = Bar([1,2,3])
+[typing fixtures/typing-full.pyi]
 [out]
 def __top_level__():
     r0, r1 :: object
@@ -2517,57 +2518,54 @@ def __top_level__():
     r37, r38 :: str
     r39 :: object
     r40 :: tuple[str, object]
-    r41 :: object
-    r42 :: str
-    r43 :: object
-    r44 :: tuple[str, object]
-    r45 :: object
-    r46 :: tuple[object, object]
-    r47 :: object
-    r48 :: dict
-    r49 :: str
-    r50, r51 :: object
-    r52 :: dict
-    r53 :: str
-    r54 :: int32
-    r55 :: bit
+    r41 :: str
+    r42 :: object
+    r43 :: tuple[str, object]
+    r44 :: tuple[tuple[str, object], tuple[str, object]]
+    r45 :: dict
+    r46 :: str
+    r47, r48, r49 :: object
+    r50 :: dict
+    r51 :: str
+    r52 :: int32
+    r53 :: bit
+    r54 :: str
+    r55 :: dict
     r56 :: str
-    r57 :: dict
-    r58 :: str
-    r59, r60, r61 :: object
-    r62 :: tuple
-    r63 :: dict
-    r64 :: str
-    r65 :: int32
-    r66 :: bit
-    r67 :: dict
-    r68 :: str
-    r69, r70, r71 :: object
-    r72 :: dict
-    r73 :: str
-    r74 :: int32
-    r75 :: bit
+    r57, r58, r59 :: object
+    r60 :: tuple
+    r61 :: dict
+    r62 :: str
+    r63 :: int32
+    r64 :: bit
+    r65 :: dict
+    r66 :: str
+    r67, r68, r69 :: object
+    r70 :: dict
+    r71 :: str
+    r72 :: int32
+    r73 :: bit
+    r74 :: str
+    r75 :: dict
     r76 :: str
-    r77 :: dict
-    r78 :: str
-    r79 :: object
-    r80 :: dict
-    r81 :: str
-    r82, r83 :: object
-    r84 :: dict
-    r85 :: str
-    r86 :: int32
-    r87 :: bit
-    r88 :: list
-    r89, r90, r91 :: object
-    r92, r93, r94, r95 :: ptr
-    r96 :: dict
-    r97 :: str
-    r98, r99 :: object
-    r100 :: dict
-    r101 :: str
-    r102 :: int32
-    r103 :: bit
+    r77 :: object
+    r78 :: dict
+    r79 :: str
+    r80, r81 :: object
+    r82 :: dict
+    r83 :: str
+    r84 :: int32
+    r85 :: bit
+    r86 :: list
+    r87, r88, r89 :: object
+    r90, r91, r92, r93 :: ptr
+    r94 :: dict
+    r95 :: str
+    r96, r97 :: object
+    r98 :: dict
+    r99 :: str
+    r100 :: int32
+    r101 :: bit
 L0:
     r0 = builtins :: module
     r1 = load_address _Py_NoneStruct
@@ -2586,9 +2584,9 @@ L2:
     r10 = get_element_ptr r9 ob_item :: PyListObject
     r11 = load_mem r10 :: ptr*
     set_mem r11, r6 :: builtins.object*
-    r12 = r11 + WORD_SIZE*1
+    r12 = r11 + 8
     set_mem r12, r7 :: builtins.object*
-    r13 = r11 + WORD_SIZE*2
+    r13 = r11 + 16
     set_mem r13, r8 :: builtins.object*
     keep_alive r9
     r14 = 'typing'
@@ -2619,73 +2617,71 @@ L2:
     r38 = 'a'
     r39 = load_address PyLong_Type
     r40 = (r38, r39)
-    r41 = box(tuple[str, object], r40)
-    r42 = 'b'
-    r43 = load_address PyUnicode_Type
-    r44 = (r42, r43)
-    r45 = box(tuple[str, object], r44)
-    r46 = (r41, r45)
-    r47 = box(tuple[object, object], r46)
-    r48 = __main__.globals :: static
-    r49 = 'NamedTuple'
-    r50 = CPyDict_GetItem(r48, r49)
-    r51 = PyObject_CallFunctionObjArgs(r50, r37, r47, 0)
-    r52 = __main__.globals :: static
-    r53 = 'Lol'
-    r54 = CPyDict_SetItem(r52, r53, r51)
-    r55 = r54 >= 0 :: signed
-    r56 = ''
-    r57 = __main__.globals :: static
-    r58 = 'Lol'
-    r59 = CPyDict_GetItem(r57, r58)
-    r60 = box(short_int, 2)
-    r61 = PyObject_CallFunctionObjArgs(r59, r60, r56, 0)
-    r62 = cast(tuple, r61)
-    r63 = __main__.globals :: static
-    r64 = 'x'
-    r65 = CPyDict_SetItem(r63, r64, r62)
-    r66 = r65 >= 0 :: signed
-    r67 = __main__.globals :: static
-    r68 = 'List'
-    r69 = CPyDict_GetItem(r67, r68)
-    r70 = load_address PyLong_Type
-    r71 = PyObject_GetItem(r69, r70)
-    r72 = __main__.globals :: static
-    r73 = 'Foo'
-    r74 = CPyDict_SetItem(r72, r73, r71)
-    r75 = r74 >= 0 :: signed
-    r76 = 'Bar'
-    r77 = __main__.globals :: static
-    r78 = 'Foo'
-    r79 = CPyDict_GetItem(r77, r78)
-    r80 = __main__.globals :: static
-    r81 = 'NewType'
-    r82 = CPyDict_GetItem(r80, r81)
-    r83 = PyObject_CallFunctionObjArgs(r82, r76, r79, 0)
-    r84 = __main__.globals :: static
-    r85 = 'Bar'
-    r86 = CPyDict_SetItem(r84, r85, r83)
-    r87 = r86 >= 0 :: signed
-    r88 = PyList_New(3)
-    r89 = box(short_int, 2)
-    r90 = box(short_int, 4)
-    r91 = box(short_int, 6)
-    r92 = get_element_ptr r88 ob_item :: PyListObject
-    r93 = load_mem r92 :: ptr*
+    r41 = 'b'
+    r42 = load_address PyUnicode_Type
+    r43 = (r41, r42)
+    r44 = (r40, r43)
+    r45 = __main__.globals :: static
+    r46 = 'NamedTuple'
+    r47 = CPyDict_GetItem(r45, r46)
+    r48 = box(tuple[tuple[str, object], tuple[str, object]], r44)
+    r49 = PyObject_CallFunctionObjArgs(r47, r37, r48, 0)
+    r50 = __main__.globals :: static
+    r51 = 'Lol'
+    r52 = CPyDict_SetItem(r50, r51, r49)
+    r53 = r52 >= 0 :: signed
+    r54 = ''
+    r55 = __main__.globals :: static
+    r56 = 'Lol'
+    r57 = CPyDict_GetItem(r55, r56)
+    r58 = box(short_int, 2)
+    r59 = PyObject_CallFunctionObjArgs(r57, r58, r54, 0)
+    r60 = cast(tuple, r59)
+    r61 = __main__.globals :: static
+    r62 = 'x'
+    r63 = CPyDict_SetItem(r61, r62, r60)
+    r64 = r63 >= 0 :: signed
+    r65 = __main__.globals :: static
+    r66 = 'List'
+    r67 = CPyDict_GetItem(r65, r66)
+    r68 = load_address PyLong_Type
+    r69 = PyObject_GetItem(r67, r68)
+    r70 = __main__.globals :: static
+    r71 = 'Foo'
+    r72 = CPyDict_SetItem(r70, r71, r69)
+    r73 = r72 >= 0 :: signed
+    r74 = 'Bar'
+    r75 = __main__.globals :: static
+    r76 = 'Foo'
+    r77 = CPyDict_GetItem(r75, r76)
+    r78 = __main__.globals :: static
+    r79 = 'NewType'
+    r80 = CPyDict_GetItem(r78, r79)
+    r81 = PyObject_CallFunctionObjArgs(r80, r74, r77, 0)
+    r82 = __main__.globals :: static
+    r83 = 'Bar'
+    r84 = CPyDict_SetItem(r82, r83, r81)
+    r85 = r84 >= 0 :: signed
+    r86 = PyList_New(3)
+    r87 = box(short_int, 2)
+    r88 = box(short_int, 4)
+    r89 = box(short_int, 6)
+    r90 = get_element_ptr r86 ob_item :: PyListObject
+    r91 = load_mem r90 :: ptr*
+    set_mem r91, r87 :: builtins.object*
+    r92 = r91 + 8
+    set_mem r92, r88 :: builtins.object*
+    r93 = r91 + 16
     set_mem r93, r89 :: builtins.object*
-    r94 = r93 + WORD_SIZE*1
-    set_mem r94, r90 :: builtins.object*
-    r95 = r93 + WORD_SIZE*2
-    set_mem r95, r91 :: builtins.object*
-    keep_alive r88
-    r96 = __main__.globals :: static
-    r97 = 'Bar'
-    r98 = CPyDict_GetItem(r96, r97)
-    r99 = PyObject_CallFunctionObjArgs(r98, r88, 0)
-    r100 = __main__.globals :: static
-    r101 = 'y'
-    r102 = CPyDict_SetItem(r100, r101, r99)
-    r103 = r102 >= 0 :: signed
+    keep_alive r86
+    r94 = __main__.globals :: static
+    r95 = 'Bar'
+    r96 = CPyDict_GetItem(r94, r95)
+    r97 = PyObject_CallFunctionObjArgs(r96, r86, 0)
+    r98 = __main__.globals :: static
+    r99 = 'y'
+    r100 = CPyDict_SetItem(r98, r99, r97)
+    r101 = r100 >= 0 :: signed
     return 1
 
 [case testChainedConditional]

diff --git a/mypyc/test-data/irbuild-tuple.test b/mypyc/test-data/irbuild-tuple.test
@@ -169,6 +169,7 @@ def f(nt: NT, b: bool) -> int:
     if b:
         return nt.x
     return nt.y
+[typing fixtures/typing-full.pyi]
 [out]
 def f(nt, b):
     nt :: tuple

diff --git a/test-data/unit/deps-classes.test b/test-data/unit/deps-classes.test
@@ -16,7 +16,8 @@ def f(a: Any) -> None:
     n.a
 [file a.py]
 class A: pass
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
+[typing fixtures/typing-namedtuple.pyi]
 [out]
 <m.N.__init__> -> m.f
 <m.N.__new__> -> m.f
@@ -36,7 +37,8 @@ def f(a: Any) -> None:
 [file a.py]
 class A: pass
 class B: pass
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
+[typing fixtures/typing-namedtuple.pyi]
 [out]
 <m.N.__init__> -> m.f
 <m.N.__new__> -> m.f
@@ -52,7 +54,8 @@ N = NamedTuple('N', [('x', int)])
 x = N(1)
 M = NamedTuple('M', [('z', 'N')])
 y = M(x)
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
+[typing fixtures/typing-namedtuple.pyi]
 [out]
 <m.M.__init__> -> m
 <m.M.__new__> -> m

diff --git a/test-data/unit/deps-types.test b/test-data/unit/deps-types.test
@@ -864,7 +864,8 @@ from mod import I
 A = I
 [file mod.py]
 class I: pass
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
+[typing fixtures/typing-namedtuple.pyi]
 [out]
 <a.A> -> m
 <a> -> m

diff --git a/test-data/unit/diff.test b/test-data/unit/diff.test
@@ -273,7 +273,8 @@ M = NamedTuple('M', [('x', int), ('y', str)])
 from typing import NamedTuple
 N = NamedTuple('N', [('x', int), ('y', int)])
 M = NamedTuple('M', [('x', int), ('y', str)])
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
+[typing fixtures/typing-namedtuple.pyi]
 [out]
 __main__.A
 __main__.N