Skip to content

Call dealias after stripping type variables for tupleElementTypesUpTo #23005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/TypeUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class TypeUtils:
def tupleElementTypesUpTo(bound: Int, normalize: Boolean = true)(using Context): Option[List[Type]] =
def recur(tp: Type, bound: Int): Option[List[Type]] =
if bound < 0 then Some(Nil)
else (if normalize then tp.normalized else tp).dealias match
else (if normalize then tp.dealias.normalized else tp).dealias match
case AppliedType(tycon, hd :: tl :: Nil) if tycon.isRef(defn.PairClass) =>
recur(tl, bound - 1).map(hd :: _)
case tp: AppliedType if defn.isTupleNType(tp) && normalize =>
Expand Down
1 change: 1 addition & 0 deletions compiler/test/dotc/pos-test-pickling.excludelist
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ i18211.scala
named-tuples1.scala
i20897.scala
i20512.scala
i22645b.scala

# Opaque type
i5720.scala
Expand Down
48 changes: 48 additions & 0 deletions tests/pos/i22643.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import language.experimental.namedTuples



object ExhibitB:

trait JoinB[A <: Tuple, B <: Tuple]:
type NTB = NamedTuple.NamedTuple[Tuple.Concat[A, B], (String, Int)]
val ntB: NTB = ???

val joinB: JoinB[Tuple1["nameB"], Tuple1["ageB"]] = ???

joinB.ntB.nameB // works


object ExhibitC:

type A = Tuple1["nameC"]
type B = Tuple1["ageC"]

type NamesC = Tuple.Concat[A, B]
type NTC = NamedTuple.NamedTuple[NamesC, (String, Int)]
val ntC: NTC = ???

ntC.nameC // works


object ExhibitD:

trait JoinD[A, B]:
type NamesD = (A, B)
type NTD = NamedTuple.NamedTuple[NamesD, (String, Int)]
val ntD: NTD = ???

val joinD: JoinD["nameD", "ageD"] = ???

joinD.ntD.nameD // works

object ExhibitA:

trait JoinA[A <: Tuple, B <: Tuple]:
type NamesA = Tuple.Concat[A, B]
type NTA = NamedTuple.NamedTuple[NamesA, (String, Int)]
val ntA: NTA = ???

val joinA: JoinA[Tuple1["nameA"], Tuple1["ageA"]] = ???

joinA.ntA.nameA // fixed
44 changes: 44 additions & 0 deletions tests/pos/i22645a.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import language.experimental.namedTuples
object ExhibitA: // fails

class SelectableNT[N <: Tuple] extends Selectable:
def selectDynamic(name: String) = ???
type Names = Tuple.Map[N, [X] =>> X]
type Fields = NamedTuple.NamedTuple[Names, (String, Int)]

val x = new SelectableNT[("name", "age")]
x.name // fails


object ExhibitB: // works

class SelectableNT[N <: Tuple] extends Selectable:
def selectDynamic(name: String) = ???
type Fields = NamedTuple.NamedTuple[N, (String, Int)]

val x = new SelectableNT[("name", "age")]
x.name


object ExhibitC: // works

class SelectableNT[N <: Tuple] extends Selectable:
def selectDynamic(name: String) = ???
type Fields = NamedTuple.NamedTuple[N, (String, Int)]

type N = ("name", "age")
val x = new SelectableNT[N]
x.name


object ExhibitD: // works

class SelectableNT[N <: Tuple] extends Selectable:
def selectDynamic(name: String) = ???
type Fields = NamedTuple.NamedTuple[N, (String, Int)]

type N = ("name", "age")
type Names = Tuple.Map[N, [X] =>> X]
val x = new SelectableNT[Names]
x.name

12 changes: 12 additions & 0 deletions tests/pos/i22645b.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import language.experimental.namedTuples
object ExhibitE: // works

type N = ("name", "age")
type Names = Tuple.Map[N, [X] =>> X]

class SelectableNT extends Selectable:
def selectDynamic(name: String) = ???
type Fields = NamedTuple.NamedTuple[Names, (String, Int)]

val x = new SelectableNT
x.name
Loading