aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala/async/internal/TransformUtils.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-25 18:49:51 -0400
committerJason Zaugg <jzaugg@gmail.com>2014-09-29 16:44:14 +1000
commitb420446c9f82176e7fe4973576fb2d7f22b28893 (patch)
tree8b77368b85b7c00c51697033189ef64d2f2d6e16 /src/main/scala/scala/async/internal/TransformUtils.scala
parent51579303e83fb134bba3ed7279f92da90103c4f2 (diff)
downloadscala-async-b420446c9f82176e7fe4973576fb2d7f22b28893.tar.gz
scala-async-b420446c9f82176e7fe4973576fb2d7f22b28893.tar.bz2
scala-async-b420446c9f82176e7fe4973576fb2d7f22b28893.zip
Avoid assigning null to vars of derived value type
`TreeGen#mkZero` returns `q"null"` for derived value classes. ``` scala> class V(val a: String) extends AnyVal defined class V scala> showRaw(gen.mkZero(typeOf[V])) res0: String = Literal(Constant(null)) ``` We use this API in async to generate the initial value for ANF-lifted temporary variables. However, this leads to NPEs, as after posterasure, we call the unbox method on a null reference: ``` % cat sandbox/Macro.scala; scalac-hash v2.10.4 sandbox/Macro.scala; scala-hash v2.10.4 -e 'val x = Macros.myMacro' import scala.reflect.macros.Context import scala.language.experimental.macros object Macros { def macroImpl(c: Context): c.Expr[C] = { import c.universe._ val e1 = c.Expr[C](Literal(Constant(null)).setType(typeOf[C])) reify(e1.splice.asInstanceOf[C @annotation.unchecked.uncheckedVariance]) } def myMacro: C = macro macroImpl } class C(val a: String) extends AnyVal java.lang.NullPointerException at Main$$anon$1.<init>(scalacmd4059893593754060829.scala:1) at Main$.main(scalacmd4059893593754060829.scala:1) at Main.main(scalacmd4059893593754060829.scala) ``` This commit installs a custom version of `mkZero` that instead returns `q"new C[$..targs](${mkZero(wrappedType)})`. Thanks to @ewiner for pinpointing the problem.
Diffstat (limited to 'src/main/scala/scala/async/internal/TransformUtils.scala')
-rw-r--r--src/main/scala/scala/async/internal/TransformUtils.scala13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index bef52f1..5e73a7f 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -258,6 +258,19 @@ private[async] trait TransformUtils {
}
}
+ def mkZero(tp: Type): Tree = {
+ if (tp.typeSymbol.isDerivedValueClass) {
+ val argZero = mkZero(tp.memberType(tp.typeSymbol.derivedValueClassUnbox).resultType)
+ val target: Tree = gen.mkAttributedSelect(
+ typer.typedPos(macroPos)(
+ New(TypeTree(tp.baseType(tp.typeSymbol)))), tp.typeSymbol.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 = {