Added a cast for alias replacement that caused

code to be untypable. The optimization that replaced an overriding param
field with its super field now downcasts when they don't have the same
type.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index 95c79eb97e..6f5175c0ea 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -182,15 +182,16 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
           mayNeedProtectedAccessor(sel, args, false)
 
         case sel @ Select(qual @ This(_), name) =>
-           if ((sym hasFlag PARAMACCESSOR) && (sym.alias != NoSymbol)) {
+           if ((sym hasFlag PARAMACCESSOR)
+               && (sym.alias != NoSymbol)) {
             val result = localTyper.typed {
-              Select(
-                Super(qual.symbol, nme.EMPTY.toTypeName/*qual.symbol.info.parents.head.symbol.name*/) setPos qual.pos,
-                sym.alias) setPos tree.pos
+                Select(
+                  Super(qual.symbol, nme.EMPTY.toTypeName/*qual.symbol.info.parents.head.symbol.name*/) setPos qual.pos,
+                  sym.alias) setPos tree.pos
             }
             if (settings.debug.value)
               Console.println("alias replacement: " + tree + " ==> " + result);//debug
-            transformSuperSelect(result)
+            localTyper.typed(gen.maybeMkAsInstanceOf(transformSuperSelect(result), sym.tpe, sym.alias.tpe, true))
           }
           else mayNeedProtectedAccessor(sel, List(EmptyTree), false)