summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-08-04 07:41:38 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-08-04 07:41:38 -0700
commitab63cca87f68d80aff0ff6cd83ecd85b9e1d0c7a (patch)
treeb9e5ededba9f25d6b24992929b36af53ac7ce3bf /src/compiler
parent2cee58f5a1f8f93b239b3086d6ab0c30729c6523 (diff)
parent991b50f3f440a631bfa1d76f79fdc31ccdbc3fdf (diff)
downloadscala-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.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 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))
}