In mkDefaultValue first check for a value type ...

In mkDefaultValue first check for a value type and only then for
reference type; fixes the problem with the default value when value
types implement interfaces and are therefore considered reference types

1 files changed, 1 insertions, 1 deletions

diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java
index e6b98f0f42..d8f61d27de 100644
--- a/sources/scalac/ast/TreeGen.java
+++ b/sources/scalac/ast/TreeGen.java
@@ -173,10 +173,10 @@ public class TreeGen implements Kinds, Modifiers, TypeTags {
 
     /** Builds a default zero value according to given type. */
     public Tree mkDefaultValue(int pos, Type type) {
-	if (definitions.ALLREF_TYPE().isSubType(type)) return mkNullLit(pos);
         switch (type.unbox()) {
         case UnboxedType(int tag): return mkDefaultValue(pos, tag);
         }
+	if (definitions.ALLREF_TYPE().isSubType(type)) return mkNullLit(pos);
         return mkZeroLit(pos);
     }