- Fixed Pickle and UnPickle to handle correctly...

- Fixed Pickle and UnPickle to handle correctly compound types

1 files changed, 14 insertions, 2 deletions

diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java
index aa88139ad2..f3a715b480 100644
--- a/sources/scalac/symtab/classfile/UnPickle.java
+++ b/sources/scalac/symtab/classfile/UnPickle.java
@@ -399,9 +399,21 @@ public class UnPickle implements Kinds, Modifiers, EntryTags, TypeTags {
 		    readTypeRef(owner), readSymbolRef(), readTypeRefs(end, owner));
 		break;
 	    case COMPOUNDtpe:
-		Symbol clazz = readSymbolRef();
+                boolean isCompoundSym = readByte() != 0;
+                Symbol ctOwner = isCompoundSym
+                    ? readSymbolRef()
+                    : null;
+                int ctClassRef = readNat();
+                Symbol ctClass = isCompoundSym
+                    ? (Symbol)entries[ctClassRef]
+                    : getSymbol(ctClassRef);
 		Type[] parents = readTypeRefs(end, owner);
-                tpe = Type.compoundType(parents, new Scope(), clazz);
+                if (ctClass == null) {
+                    tpe = Type.compoundTypeWithOwner(ctOwner, parents, new Scope());
+                    entries[ctClassRef] = tpe.symbol();
+                } else {
+                    tpe = Type.compoundType(parents, new Scope(), ctClass);
+                }
 		break;
 	    case METHODtpe:
 		Type restype = readTypeRef(owner);