comments

Author: svalentin

mypyc/irbuild/missingtypevisitor.py

@@ -2,7 +2,7 @@
 
 from mypy.nodes import Expression, Node
 from mypy.traverser import ExtendedTraverserVisitor
-from mypy.types import Type, AnyType, TypeOfAny
+from mypy.types import AnyType, Type, TypeOfAny
 
 
 class MissingTypesVisitor(ExtendedTraverserVisitor):

mypyc/irbuild/prebuildvisitor.py

@@ -97,7 +97,7 @@ def visit(self, o: Node) -> bool:
     def visit_assignment_stmt(self, stmt: AssignmentStmt) -> None:
         # These are cases where mypy may not have types for certain expressions,
         # but mypyc needs some form type to exist.
-        if isinstance(stmt.rvalue, IndexExpr) and stmt.rvalue.analyzed:
+        if stmt.is_alias_def:
             stmt.rvalue.accept(self.missing_types_visitor)
         return super().visit_assignment_stmt(stmt)
 

mypyc/test-data/irbuild-classes.test

@@ -1338,9 +1338,10 @@ if True:
 
 [case testEnumClassAlias]
 from enum import Enum
-from typing import Literal
+from typing import Literal, Union
 
 class SomeEnum(Enum):
     AVALUE = "a"
 
 ALIAS = Literal[SomeEnum.AVALUE]
+ALIAS2 = Union[Literal[SomeEnum.AVALUE], None]

mypyc/test-data/run-python312.test

@@ -1,5 +1,6 @@
 [case testPEP695Basics]
-from typing import Any, TypeAliasType, cast
+from enum import Enum
+from typing import Any, Literal, TypeAliasType, cast
 
 from testutil import assertRaises
 
@@ -188,6 +189,13 @@ type R = int | list[R]
 def test_recursive_type_alias() -> None:
     assert isinstance(R, TypeAliasType)
     assert getattr(R, "__value__") == (int | list[R])
+
+class SomeEnum(Enum):
+    AVALUE = "a"
+
+type EnumLiteralAlias1 = Literal[SomeEnum.AVALUE]
+type EnumLiteralAlias2 = Literal[SomeEnum.AVALUE] | None
+EnumLiteralAlias3 = Literal[SomeEnum.AVALUE] | None
 [typing fixtures/typing-full.pyi]
 
 [case testPEP695GenericTypeAlias]