[mypyc] Fix some deserialization related issues (python#7989)

msullivan · web-flow · commit 23a719fe57a2 · 2019-11-21T11:34:31.000-08:00
Certain parts of the mypy AST aren't present and we were relying on
them anyways. This caused a crash when subclassing and classes not
making it into the type table, preventing using fast paths.
diff --git a/mypyc/genops.py b/mypyc/genops.py
@@ -162,9 +162,11 @@ def load_type_map(mapper: 'Mapper',
                   deser_ctx: DeserMaps) -> None:
     """Populate a Mapper with deserialized IR from a list of modules."""
     for module in modules:
-        for node in module.defs:
-            if isinstance(node, ClassDef):
-                mapper.type_to_ir[node.info] = deser_ctx.classes[node.fullname]
+        for name, node in module.names.items():
+            if isinstance(node.node, TypeInfo):
+                ir = deser_ctx.classes[node.node.fullname]
+                mapper.type_to_ir[node.node] = ir
+                mapper.func_to_decl[node.node] = ir.ctor
 
     for module in modules:
         for func in get_module_func_defs(module):
@@ -457,8 +459,8 @@ def fdef_to_sig(self, fdef: FuncDef) -> FuncSignature:
             arg_types = [object_rprimitive for arg in fdef.arguments]
             ret = object_rprimitive
 
-        args = [RuntimeArg(arg.variable.name, arg_type, arg.kind)
-                for arg, arg_type in zip(fdef.arguments, arg_types)]
+        args = [RuntimeArg(arg_name, arg_type, arg_kind)
+                for arg_name, arg_kind, arg_type in zip(fdef.arg_names, fdef.arg_kinds, arg_types)]
 
         # We force certain dunder methods to return objects to support letting them
         # return NotImplemented. It also avoids some pointless boxing and unboxing,
diff --git a/mypyc/test-data/run-multimodule.test b/mypyc/test-data/run-multimodule.test
@@ -30,6 +30,41 @@ except TypeError:
 else:
     assert False
 
+[case testMultiModuleFastpaths]
+[file other_main.py]
+
+[file other_main.py.2]
+from other_b import A, func
+
+class B(A):
+    pass
+
+def test() -> None:
+    a = A()
+    assert func() == 12
+    assert a.method() == "test"
+
+test()
+
+[file other_b.py]
+class A:
+    def method(self) -> str:
+        return "test"
+
+def func() -> int:
+    return 12
+
+# Remove all the methods and functions from globals to ensure that
+# they get called via the fastpaths even when doing incremental
+# compilation.
+setattr(A, 'method', None)
+setattr(A, '__init__', None)
+globals()['func'] = None
+globals()['A'] = None
+
+[file driver.py]
+import other_main
+
 [case testMultiModuleSameNames]
 # Use same names in both modules
 import other
diff --git a/mypyc/test/test_run.py b/mypyc/test/test_run.py
@@ -224,8 +224,10 @@ def run_case_step(self, testcase: DataDrivenTestCase, incremental_step: int) ->
                 print(line)
             assert False, 'Compile error'
 
-        # Check that serialization works on this IR
-        check_serialization_roundtrip(ir)
+        # Check that serialization works on this IR. (Only on the first
+        # step because the the returned ir only includes updated code.)
+        if incremental_step == 1:
+            check_serialization_roundtrip(ir)
 
         setup_file = os.path.abspath(os.path.join(WORKDIR, 'setup.py'))
         # We pass the C file information to the build script via setup.py unfortunately
