- pass null as ancestor code when it is empty, ...

- pass null as ancestor code when it is empty, instead of creating an
array each time

2 files changed, 8 insertions, 2 deletions

diff --git a/sources/scala/runtime/types/TypeConstructor.java b/sources/scala/runtime/types/TypeConstructor.java
index 50029ed49d..6973050105 100644
--- a/sources/scala/runtime/types/TypeConstructor.java
+++ b/sources/scala/runtime/types/TypeConstructor.java
@@ -78,6 +78,8 @@ public class TypeConstructor implements java.io.Serializable {
     private static final ClassLoader loader =
         ClassLoader.getSystemClassLoader();
 
+    private static final int[] EMPTY_ANCESTOR_CODE = new int[0];
+
     public TypeConstructor(int level,
                            String fullName,
                            Object outer,
@@ -93,7 +95,8 @@ public class TypeConstructor implements java.io.Serializable {
         this.pCount = pCount;
 
         this.ancestorCacheDepth = ancestorCacheDepth;
-        this.ancestorCode = ancestorCode;
+        this.ancestorCode =
+            (ancestorCode == null ? EMPTY_ANCESTOR_CODE : ancestorCode);
 
         this.isTrivial = (outer == null) && (zCount + pCount + mCount == 0);
         this.isStronglyTrivial = (ancestorCacheDepth == 0);
diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java
index 6eea866c11..11dcaa2487 100644
--- a/sources/scalac/transformer/TypesAsValuesPhase.java
+++ b/sources/scalac/transformer/TypesAsValuesPhase.java
@@ -588,6 +588,7 @@ public class TypesAsValuesPhase extends Phase {
             }
 
             Ancestor[][] ancestors = computeAncestors(clsSym);
+            int[] ancestorCode = getAncestorCode(ancestors);
 
             Tree outer = isNestedClass(clsSym)
                 ? (clsSym.owner().isClass()
@@ -603,7 +604,9 @@ public class TypesAsValuesPhase extends Phase {
                 gen.mkIntLit(pos, mCount),
                 gen.mkIntLit(pos, pCount),
                 gen.mkIntLit(pos, ancestors.length),
-                mkNewIntLitArray(pos, getAncestorCode(ancestors), owner)
+                ancestorCode.length == 0
+                ? gen.mkNullLit(pos)
+                : mkNewIntLitArray(pos, getAncestorCode(ancestors), owner)
             };
 
             Symbol tcConst = defs.TYPECONSTRUCTOR_CLASS.primaryConstructor();