[mypyc] Fix is_native_ref_expr for class attrs.

Author: jhance

mypyc/irbuild/builder.py

@@ -979,17 +979,13 @@ def _analyze_iterable_item_type(self, expr: Expression) -> Type:
 
     def is_native_module(self, module: str) -> bool:
         """Is the given module one compiled by mypyc?"""
-        return module in self.mapper.group_map
+        return self.mapper.is_native_module(module)
 
     def is_native_ref_expr(self, expr: RefExpr) -> bool:
-        if expr.node is None:
-            return False
-        if "." in expr.node.fullname:
-            return self.is_native_module(expr.node.fullname.rpartition(".")[0])
-        return True
+        return self.mapper.is_native_ref_expr(expr)
 
     def is_native_module_ref_expr(self, expr: RefExpr) -> bool:
-        return self.is_native_ref_expr(expr) and expr.kind == GDEF
+        return self.mapper.is_native_module_ref_expr(expr)
 
     def is_synthetic_type(self, typ: TypeInfo) -> bool:
         """Is a type something other than just a class we've created?"""

mypyc/irbuild/mapper.py

@@ -214,7 +214,12 @@ def is_native_ref_expr(self, expr: RefExpr) -> bool:
         if expr.node is None:
             return False
         if "." in expr.node.fullname:
-            return self.is_native_module(expr.node.fullname.rpartition(".")[0])
+            cur = expr.node.fullname
+            while "." in cur:
+                cur = cur.rpartition(".")[0]
+                if self.is_native_module(cur):
+                    return True
+            return False
         return True
 
     def is_native_module_ref_expr(self, expr: RefExpr) -> bool:

mypyc/test-data/irbuild-classes.test

@@ -1300,3 +1300,110 @@ class T:
 
 class E(T):
     y: str  # E: Type of "y" is incompatible with definition in trait "T"
+[case testClassBodyAttributeAccess_toplevel]
+from typing import Final
+
+class C:
+    a: Final = {'x': 'y'}
+    b: Final = a
+[out]
+def C.__mypyc_defaults_setup(__mypyc_self__):
+    __mypyc_self__ :: __main__.C
+    r0, r1 :: str
+    r2, r3 :: dict
+    r4 :: bool
+L0:
+    r0 = 'x'
+    r1 = 'y'
+    r2 = CPyDict_Build(1, r0, r1)
+    __mypyc_self__.a = r2
+    r3 = __main__.C.a :: static
+    if is_error(r3) goto L1 else goto L2
+L1:
+    r4 = raise NameError('value for final name "a" was not set')
+    unreachable
+L2:
+    __mypyc_self__.b = r3
+    return 1
+def __top_level__():
+    r0, r1 :: object
+    r2 :: bit
+    r3 :: str
+    r4, r5 :: object
+    r6 :: str
+    r7 :: dict
+    r8, r9 :: object
+    r10 :: str
+    r11, r12 :: object
+    r13 :: bool
+    r14, r15, r16 :: str
+    r17 :: tuple
+    r18 :: i32
+    r19 :: bit
+    r20 :: dict
+    r21 :: str
+    r22 :: i32
+    r23 :: bit
+    r24 :: object
+    r25, r26 :: str
+    r27 :: dict
+    r28 :: str
+    r29 :: i32
+    r30 :: bit
+    r31 :: object
+    r32 :: dict
+    r33 :: bool
+    r34 :: str
+    r35 :: i32
+    r36 :: bit
+L0:
+    r0 = builtins :: module
+    r1 = load_address _Py_NoneStruct
+    r2 = r0 != r1
+    if r2 goto L2 else goto L1 :: bool
+L1:
+    r3 = 'builtins'
+    r4 = PyImport_Import(r3)
+    builtins = r4 :: module
+L2:
+    r5 = ('Final',)
+    r6 = 'typing'
+    r7 = __main__.globals :: static
+    r8 = CPyImport_ImportFromMany(r6, r5, r5, r7)
+    typing = r8 :: module
+    r9 = <error> :: object
+    r10 = '__main__'
+    r11 = __main__.C_template :: type
+    r12 = CPyType_FromTemplate(r11, r9, r10)
+    r13 = C_trait_vtable_setup()
+    r14 = '__mypyc_attrs__'
+    r15 = 'a'
+    r16 = 'b'
+    r17 = PyTuple_Pack(2, r15, r16)
+    r18 = PyObject_SetAttr(r12, r14, r17)
+    r19 = r18 >= 0 :: signed
+    __main__.C = r12 :: type
+    r20 = __main__.globals :: static
+    r21 = 'C'
+    r22 = CPyDict_SetItem(r20, r21, r12)
+    r23 = r22 >= 0 :: signed
+    r24 = __main__.C :: type
+    r25 = 'x'
+    r26 = 'y'
+    r27 = CPyDict_Build(1, r25, r26)
+    r28 = 'a'
+    r29 = PyObject_SetAttr(r24, r28, r27)
+    r30 = r29 >= 0 :: signed
+    __main__.C.a = r27 :: static
+    r31 = __main__.C :: type
+    r32 = __main__.C.a :: static
+    if is_error(r32) goto L3 else goto L4
+L3:
+    r33 = raise NameError('value for final name "a" was not set')
+    unreachable
+L4:
+    r34 = 'b'
+    r35 = PyObject_SetAttr(r31, r34, r32)
+    r36 = r35 >= 0 :: signed
+    __main__.C.b = r32 :: static
+    return 1

mypyc/test-data/run-classes.test

@@ -2503,3 +2503,14 @@ class C:
 def test_final_attribute() -> None:
     assert C.A == -1
     assert C.a == [-1]
+[case testClassWithFinalAttributeAccess]
+from typing import Final
+
+class C:
+    a: Final = {'x': 'y'}
+    b: Final = C.a
+
+def test_final_attribute() -> None:
+    assert C.a['x'] == 'y'
+    assert C.b['x'] == 'y'
+    assert C.a is C.b