Skip to content

Commit ce826ee

Browse files
oderskyDarkDimius
authored andcommitted
Avoid generating Any in erasedLubs
... because Any is not an erasedType (this is now checked)
1 parent 3c6cf39 commit ce826ee

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/dotty/tools/dotc/TypeErasure.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ object TypeErasure {
3131
*/
3232
def isErasedType(tp: Type)(implicit ctx: Context): Boolean = tp match {
3333
case tp: TypeRef =>
34-
tp.symbol.isClass
34+
tp.symbol.isClass && tp.symbol != defn.AnyClass
3535
case _: TermRef =>
3636
true
3737
case JavaArrayType(elem) =>
@@ -168,7 +168,7 @@ object TypeErasure {
168168
def loop(bcs: List[ClassSymbol], bestSoFar: ClassSymbol): ClassSymbol = bcs match {
169169
case bc :: bcs1 =>
170170
if (cls2.derivesFrom(bc))
171-
if (!bc.is(Trait)) bc
171+
if (!bc.is(Trait) && bc != defn.AnyClass) bc
172172
else loop(bcs1, if (bestSoFar.derivesFrom(bc)) bestSoFar else bc)
173173
else
174174
loop(bcs1, bestSoFar)

0 commit comments

Comments
 (0)