Address PR comments

Author: jairov4

mypyc/codegen/emitfunc.py

@@ -362,10 +362,10 @@ def visit_get_attr(self, op: GetAttr) -> None:
         attr_rtype, decl_cl = cl.attr_details(op.attr)
         prefer_method = cl.is_trait and attr_rtype.error_overlap
         if cl.get_method(op.attr, prefer_method=prefer_method):
+            # Properties are essentially methods, so use vtable access for them.
             if cl.is_method_final(op.attr):
                 self.emit_method_call(f"{dest} = ", op.obj, op.attr, [])
             else:
-                # Properties are essentially methods, so use vtable access for them.
                 version = "_TRAIT" if cl.is_trait else ""
                 self.emit_line(
                     "%s = CPY_GET_ATTR%s(%s, %s, %d, %s, %s); /* %s */"

mypyc/irbuild/classdef.py

@@ -68,7 +68,6 @@
     get_func_def,
     is_constant,
     is_dataclass_decorator,
-    is_final_class,
 )
 from mypyc.primitives.dict_ops import dict_new_op, dict_set_item_op
 from mypyc.primitives.generic_ops import (
@@ -300,7 +299,6 @@ def add_attr(self, lvalue: NameExpr, stmt: AssignmentStmt) -> None:
             self.builder.init_final_static(lvalue, value, self.cdef.name)
 
     def finalize(self, ir: ClassIR) -> None:
-        ir.is_final_class = is_final_class(self.cdef)
         attrs_with_defaults, default_assignments = find_attr_initializers(
             self.builder, self.cdef, self.skip_attr_default
         )

mypyc/irbuild/prepare.py

@@ -81,7 +81,11 @@ def build_type_map(
     # references even if there are import cycles.
     for module, cdef in classes:
         class_ir = ClassIR(
-            cdef.name, module.fullname, is_trait(cdef), is_abstract=cdef.info.is_abstract
+            cdef.name,
+            module.fullname,
+            is_trait(cdef),
+            is_abstract=cdef.info.is_abstract,
+            is_final_class=cdef.info.is_final,
         )
         class_ir.is_ext_class = is_extension_class(cdef)
         if class_ir.is_ext_class:

mypyc/irbuild/util.py

@@ -27,16 +27,14 @@
     UnaryExpr,
     Var,
 )
+from mypy.semanal import refers_to_fullname
+from mypy.types import FINAL_DECORATOR_NAMES
 
 DATACLASS_DECORATORS = {"dataclasses.dataclass", "attr.s", "attr.attrs"}
 
 
 def is_final_decorator(d: Expression) -> bool:
-    return isinstance(d, RefExpr) and d.fullname == "typing.final"
-
-
-def is_final_class(cdef: ClassDef) -> bool:
-    return any(is_final_decorator(d) for d in cdef.decorators)
+    return refers_to_fullname(d, FINAL_DECORATOR_NAMES)
 
 
 def is_trait_decorator(d: Expression) -> bool:

mypyc/test-data/run-classes.test

@@ -2522,11 +2522,28 @@ class B:
     def a(self) -> int:
         return 2
 
+    @property
+    def b(self) -> int:
+        return self.a() + 2
+
+    @property
+    def c(self) -> int:
+        return 3
+
+def test_class_final_attribute_basic() -> None:
+    assert B().a() == 2
+    assert B().b == 4
+    assert B().c == 3
+
 @final
 class C(B):
     def a(self) -> int:
         return 1
 
+    @property
+    def b(self) -> int:
+        return self.a() + 1
+
 def fn(cl: B) -> int:
     return cl.a()
 
@@ -2535,3 +2552,8 @@ def test_class_final_attribute_inherited() -> None:
     assert fn(C()) == 1
     assert B().a() == 2
     assert fn(B()) == 2
+
+    assert B().b == 4
+    assert C().b == 2
+    assert B().c == 3
+    assert C().c == 3