diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-07-21 18:47:40 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-07-21 18:47:40 +0200 |
commit | 5342427303c1e91aeb0cd82007dcac4fb4249c9e (patch) | |
tree | 88338e5ada77918fc9cb251e626aec406722779f /src/main/scala/scala/async/internal/AsyncTransform.scala | |
parent | a08a822df9987bf34ec804f0e5a537da75fd3294 (diff) | |
parent | de102789917e4b9aeae2836bde70c2a8c29a7e0e (diff) | |
download | scala-async-5342427303c1e91aeb0cd82007dcac4fb4249c9e.tar.gz scala-async-5342427303c1e91aeb0cd82007dcac4fb4249c9e.tar.bz2 scala-async-5342427303c1e91aeb0cd82007dcac4fb4249c9e.zip |
Merge pull request #84 from retronym/merge/2.10.x-to-master-20140721
Merge 2.10.x to master
Diffstat (limited to 'src/main/scala/scala/async/internal/AsyncTransform.scala')
-rw-r--r-- | src/main/scala/scala/async/internal/AsyncTransform.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncTransform.scala b/src/main/scala/scala/async/internal/AsyncTransform.scala index aca8c7e..66cfb87 100644 --- a/src/main/scala/scala/async/internal/AsyncTransform.scala +++ b/src/main/scala/scala/async/internal/AsyncTransform.scala @@ -157,9 +157,10 @@ trait AsyncTransform { case ValDef(_, _, _, rhs) if liftedSyms(tree.symbol) => api.atOwner(api.currentOwner) { val fieldSym = tree.symbol - val set = Assign(gen.mkAttributedStableRef(thisType(fieldSym.owner.asClass), fieldSym), api.recur(rhs)) - set.changeOwner(tree.symbol, api.currentOwner) - api.typecheck(atPos(tree.pos)(set)) + val lhs = atPos(tree.pos) { + gen.mkAttributedStableRef(thisType(fieldSym.owner.asClass), fieldSym) + } + treeCopy.Assign(tree, lhs, api.recur(rhs)).setType(definitions.UnitTpe).changeOwner(fieldSym, api.currentOwner) } case _: DefTree if liftedSyms(tree.symbol) => EmptyTree |