[mypyc] Fix classes with the same name in multi-module mode (#7851)

mypyc/ops.py

@@ -23,7 +23,7 @@
 
 from mypy_extensions import trait
 
-from mypyc.namegen import NameGenerator
+from mypyc.namegen import NameGenerator, exported_name
 
 T = TypeVar('T')
 
@@ -1858,7 +1858,7 @@ def name_prefix(self, names: NameGenerator) -> str:
         return names.private_name(self.module_name, self.name)
 
     def struct_name(self, names: NameGenerator) -> str:
-        return '{}Object'.format(self.name_prefix(names))
+        return '{}Object'.format(exported_name(self.fullname))
 
     def get_method_and_class(self, name: str) -> Optional[Tuple[FuncIR, 'ClassIR']]:
         for ir in self.mro:

mypyc/test-data/run-multimodule.test

@@ -31,6 +31,7 @@ else:
 
 [case testMultiModuleSameNames]
 # Use same names in both modules
+import other
 def f() -> int:
     return 0
 class C:
@@ -40,6 +41,10 @@ class C:
     def f(self, x: int) -> int:
         return self.x + x
 class D(C): pass
+
+def g(x: 'other.C') -> None:
+    pass
+
 [file other.py]
 def f(x: int) -> int:
     return x + 1

mypyc/test/test_emitfunc.py

@@ -194,12 +194,12 @@ def test_list_append(self) -> None:
     def test_get_attr(self) -> None:
         self.assert_emit(
             GetAttr(self.r, 'y', 1),
-            """cpy_r_r0 = native_A_gety((AObject *)cpy_r_r); /* y */""")
+            """cpy_r_r0 = native_A_gety((mod___AObject *)cpy_r_r); /* y */""")
 
     def test_set_attr(self) -> None:
         self.assert_emit(
             SetAttr(self.r, 'y', self.m, 1),
-            "cpy_r_r0 = native_A_sety((AObject *)cpy_r_r, cpy_r_m); /* y */")
+            "cpy_r_r0 = native_A_sety((mod___AObject *)cpy_r_r, cpy_r_m); /* y */")
 
     def test_dict_get_item(self) -> None:
         self.assert_emit(PrimitiveOp([self.d, self.o2], dict_get_item_op, 1),