diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 18:49:46 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 18:49:46 +1000 |
commit | 61b4c183fa2392522051305ec12ab5f433cc09a7 (patch) | |
tree | 8b77368b85b7c00c51697033189ef64d2f2d6e16 /src/main/scala/scala/async/internal/TransformUtils.scala | |
parent | 51579303e83fb134bba3ed7279f92da90103c4f2 (diff) | |
parent | b420446c9f82176e7fe4973576fb2d7f22b28893 (diff) | |
download | scala-async-61b4c183fa2392522051305ec12ab5f433cc09a7.tar.gz scala-async-61b4c183fa2392522051305ec12ab5f433cc09a7.tar.bz2 scala-async-61b4c183fa2392522051305ec12ab5f433cc09a7.zip |
Merge pull request #91 from retronym/ticket/86-mkZero
Avoid assigning null to vars of derived value type
Diffstat (limited to 'src/main/scala/scala/async/internal/TransformUtils.scala')
-rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 13 |
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 = { |