diff options
author | Martin Odersky <odersky@gmail.com> | 2016-04-03 13:52:36 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-04-03 13:53:08 +0200 |
commit | 079943e3cd18faa034aca3b154314e6f7a94a546 (patch) | |
tree | b5b365b7f9d6f8c810a99f30a6a935af7e5fe1bc /src/dotty/tools/dotc/core/TypeComparer.scala | |
parent | d1ffa3e34610422cc8ec8a90c330cae548fa2ba6 (diff) | |
download | dotty-079943e3cd18faa034aca3b154314e6f7a94a546.tar.gz dotty-079943e3cd18faa034aca3b154314e6f7a94a546.tar.bz2 dotty-079943e3cd18faa034aca3b154314e6f7a94a546.zip |
Make erased value type take a TypeRef instead of a ClassSymbol
To address #1198, we need to avoid putting symbols in ErasedValueTypes.
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeComparer.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/TypeComparer.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/TypeComparer.scala b/src/dotty/tools/dotc/core/TypeComparer.scala index c846737b6..c039a8dfa 100644 --- a/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/src/dotty/tools/dotc/core/TypeComparer.scala @@ -237,10 +237,10 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { case OrType(tp21, tp22) => if (tp21.stripTypeVar eq tp22.stripTypeVar) isSubType(tp1, tp21) else secondTry(tp1, tp2) - case TypeErasure.ErasedValueType(cls2, underlying2) => + case TypeErasure.ErasedValueType(tycon1, underlying2) => def compareErasedValueType = tp1 match { - case TypeErasure.ErasedValueType(cls1, underlying1) => - (cls1 eq cls2) && isSameType(underlying1, underlying2) + case TypeErasure.ErasedValueType(tycon2, underlying1) => + (tycon1.symbol eq tycon2.symbol) && isSameType(underlying1, underlying2) case _ => secondTry(tp1, tp2) } |