diff options
author | Paul Phillips <paulp@improving.org> | 2012-07-30 09:13:16 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-07-30 09:24:31 -0700 |
commit | 991b50f3f440a631bfa1d76f79fdc31ccdbc3fdf (patch) | |
tree | 62fda198c732e74330867ce914194372b385eda6 | |
parent | d1b7b24b0bfb808875339366a13ed00672767c16 (diff) | |
download | scala-991b50f3f440a631bfa1d76f79fdc31ccdbc3fdf.tar.gz scala-991b50f3f440a631bfa1d76f79fdc31ccdbc3fdf.tar.bz2 scala-991b50f3f440a631bfa1d76f79fdc31ccdbc3fdf.zip |
Fix for SI-6084, type alias crasher.
"no need for pt.normalize here, is done in erasure"
ORLY? Review by @adriaanm.
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
-rw-r--r-- | test/files/pos/t6084.scala | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index b1c3249e35..69e4b5c102 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2277,7 +2277,7 @@ trait Typers extends Modes with Adaptations with Tags { // but not in real life (i.e., now that's we've reset the method's type skolems' // infos back to their pre-GADT-constraint state) if (isFullyDefined(pt) && !(body1.tpe <:< pt)) - body1 = typedPos(body1.pos)(gen.mkCast(body1, pt)) + body1 = typedPos(body1.pos)(gen.mkCast(body1, pt.normalize)) } diff --git a/test/files/pos/t6084.scala b/test/files/pos/t6084.scala new file mode 100644 index 0000000000..1aa1fed391 --- /dev/null +++ b/test/files/pos/t6084.scala @@ -0,0 +1,15 @@ +package object foo { type X[T, U] = (T => U) } + +package foo { + abstract class Foo[T, U](val d: T => U) extends (T => U) { + def f1(r: X[T, U]) = r match { case x: Foo[_,_] => x.d } // inferred ok + def f2(r: X[T, U]): (T => U) = r match { case x: Foo[_,_] => x.d } // dealiased ok + def f3(r: X[T, U]): X[T, U] = r match { case x: Foo[_,_] => x.d } // alias not ok + + // x.d : foo.this.package.type.X[?scala.reflect.internal.Types$NoPrefix$?.T, ?scala.reflect.internal.Types$NoPrefix$?.U] ~>scala.this.Function1[?scala.reflect.internal.Types$NoPrefix$?.T, ?scala.reflect.internal.Types$NoPrefix$?.U] + // at scala.Predef$.assert(Predef.scala:170) + // at scala.tools.nsc.Global.assert(Global.scala:235) + // at scala.tools.nsc.ast.TreeGen.mkCast(TreeGen.scala:252) + // at scala.tools.nsc.typechecker.Typers$Typer.typedCase(Typers.scala:2263) + } +} |