python · omkar-334 · Jul 18, 2026
diff --git a/mypy/treetransform.py b/mypy/treetransform.py
@@ -450,7 +450,9 @@ def visit_match_stmt(self, o: MatchStmt) -> MatchStmt:
        )

    def visit_star_expr(self, node: StarExpr) -> StarExpr:
-        return StarExpr(node.expr)
+        new = StarExpr(self.expr(node.expr))
+        new.valid = node.valid
+        return new

    def visit_int_expr(self, node: IntExpr) -> IntExpr:
        return IntExpr(node.value)

diff --git a/test-data/unit/check-typevar-tuple.test b/test-data/unit/check-typevar-tuple.test
@@ -2921,3 +2921,22 @@ def g(x: K) -> None:
    assert d is not None
    reveal_type(d)  # N: Revealed type is "tuple[K | list[int], ...] | tuple[*tuple[int | list[int], ...], int]"
 [builtins fixtures/tuple.pyi]
+
+[case testTypeVarTupleUnpackVarWithConstrainedTypeVarExpansion]
+# Regression test for https://github.com/python/mypy/issues/21693
+from typing import Generic, Tuple, TypeVar
+from typing_extensions import Literal, TypeVarTuple, Unpack
+
+T = TypeVar("T")
+P = TypeVar("P", Literal[True], Literal[False])
+Ts = TypeVarTuple("Ts")
+
+class Container(Generic[T, P]):
+    def foo(self) -> T: ...
+
+def f(container: Container[Tuple[Unpack[Ts]], P]) -> None:
+    result = container.foo()
+    reveal_type(result)  # N: Revealed type is "tuple[Unpack[Ts`-1]]"
+    y = (*result,)
+    reveal_type(y)  # N: Revealed type is "tuple[Unpack[Ts`-1]]"
+[builtins fixtures/tuple.pyi]