aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala/async/internal/AsyncTransform.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-07-21 12:28:51 +0200
committerJason Zaugg <jzaugg@gmail.com>2014-07-21 12:28:51 +0200
commit154a2d7d7fab1b6db940a01c212c8de0138ae930 (patch)
tree8558bd00a0553c71a3341e0bf749e40cec9e1558 /src/main/scala/scala/async/internal/AsyncTransform.scala
parent75ef24db7c9de170681d28a48f3e3ec2a47f7292 (diff)
parent1df849070694756533003c9c331cd04d0c3136e8 (diff)
downloadscala-async-154a2d7d7fab1b6db940a01c212c8de0138ae930.tar.gz
scala-async-154a2d7d7fab1b6db940a01c212c8de0138ae930.tar.bz2
scala-async-154a2d7d7fab1b6db940a01c212c8de0138ae930.zip
Merge pull request #80 from retronym/ticket/79
Fix regression around type skolems and if exprs.
Diffstat (limited to 'src/main/scala/scala/async/internal/AsyncTransform.scala')
-rw-r--r--src/main/scala/scala/async/internal/AsyncTransform.scala9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncTransform.scala b/src/main/scala/scala/async/internal/AsyncTransform.scala
index c8d2234..a24a823 100644
--- a/src/main/scala/scala/async/internal/AsyncTransform.scala
+++ b/src/main/scala/scala/async/internal/AsyncTransform.scala
@@ -156,9 +156,12 @@ trait AsyncTransform {
case ValDef(_, _, _, rhs) if liftedSyms(tree.symbol) =>
atOwner(currentOwner) {
val fieldSym = tree.symbol
- val set = Assign(gen.mkAttributedStableRef(fieldSym.owner.thisType, fieldSym), transform(rhs))
- changeOwner(set, tree.symbol, currentOwner)
- localTyper.typedPos(tree.pos)(set)
+ val lhs = atPos(tree.pos) {
+ gen.mkAttributedStableRef(fieldSym.owner.thisType, fieldSym)
+ }
+ val assign = treeCopy.Assign(tree, lhs, transform(rhs)).setType(definitions.UnitTpe)
+ changeOwner(assign, tree.symbol, currentOwner)
+ assign
}
case _: DefTree if liftedSyms(tree.symbol) =>
EmptyTree