- Fixed transformInfo to use the correct type a...

- Fixed transformInfo to use the correct type arguments in base types of
classes that don't need an interface.

1 files changed, 13 insertions, 5 deletions

diff --git a/sources/scalac/transformer/AddInterfacesPhase.java b/sources/scalac/transformer/AddInterfacesPhase.java
index fbe91662b0..ee3f939957 100644
--- a/sources/scalac/transformer/AddInterfacesPhase.java
+++ b/sources/scalac/transformer/AddInterfacesPhase.java
@@ -97,11 +97,19 @@ public class AddInterfacesPhase extends PhaseDescriptor {
                 LinkedList/*<Type>*/ newParentsLst = new LinkedList();
                 Type[] oldParents = tp.parents();
                 for (int i = 0; i < oldParents.length; ++i) {
-                    Symbol oldSym = oldParents[i].unalias().symbol();
-                    if (needInterface(oldSym))
-                        newParentsLst.addLast(getClassSymbol(oldSym).type());
-                    else
-                        newParentsLst.addLast(oldParents[i]);
+                    switch (oldParents[i]) {
+                    case TypeRef(Type pre, Symbol oldSym, Type[] args):
+                        if (needInterface(oldSym)) {
+                            newParentsLst.addLast(
+                                Type.typeRef(
+                                    pre, getClassSymbol(oldSym), args));
+                        }
+                        else
+                            newParentsLst.addLast(oldParents[i]);
+                        break;
+                    default:
+                        throw Debug.abort("illegal case", oldParents[i]);
+                    }
                 }
                 Type[] newParents = (Type[])
                     newParentsLst.toArray(new Type[newParentsLst.size()]);