Merge branch 'ticket/86-mkZero' into merge/2.10.x-to-master-20140930

Conflicts:
	src/main/scala/scala/async/internal/AnfTransform.scala
	src/main/scala/scala/async/internal/AsyncTransform.scala
	src/test/scala/scala/async/run/toughtype/ToughType.scala

1 files changed, 16 insertions, 0 deletions

diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index 665dead..da70f68 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -327,6 +327,22 @@ private[async] trait TransformUtils {
     else NoPrefix
   }
 
+  private def derivedValueClassUnbox(cls: Symbol) =
+    (cls.info.decls.find(sym => sym.isMethod && sym.asTerm.isParamAccessor) getOrElse NoSymbol)
+
+  def mkZero(tp: Type): Tree = {
+    if (tp.typeSymbol.asClass.isDerivedValueClass) {
+      val argZero = mkZero(derivedValueClassUnbox(tp.typeSymbol).infoIn(tp).resultType)
+      val target: Tree = gen.mkAttributedSelect(
+        c.typecheck(atMacroPos(
+        New(TypeTree(tp.baseType(tp.typeSymbol))))), tp.typeSymbol.asClass.primaryConstructor)
+      val zero = gen.mkMethodCall(target, argZero :: Nil)
+      gen.mkCast(zero, tp)
+    } else {
+      gen.mkZero(tp)
+    }
+  }
+
   // =====================================
   // Copy/Pasted from Scala 2.10.3. See SI-7694.
   private lazy val UncheckedBoundsClass = {