diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-04 07:41:38 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-04 07:41:38 -0700 |
commit | ab63cca87f68d80aff0ff6cd83ecd85b9e1d0c7a (patch) | |
tree | b9e5ededba9f25d6b24992929b36af53ac7ce3bf | |
parent | 2cee58f5a1f8f93b239b3086d6ab0c30729c6523 (diff) | |
parent | 991b50f3f440a631bfa1d76f79fdc31ccdbc3fdf (diff) | |
download | scala-ab63cca87f68d80aff0ff6cd83ecd85b9e1d0c7a.tar.gz scala-ab63cca87f68d80aff0ff6cd83ecd85b9e1d0c7a.tar.bz2 scala-ab63cca87f68d80aff0ff6cd83ecd85b9e1d0c7a.zip |
Merge pull request #1023 from paulp/issue/6084
Fix for SI-6084, type alias crasher.
-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 0895f5a421..4673e58b64 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2286,7 +2286,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) + } +} |