Preserve ApplyImplicitView / ApplyImplicitArgs in AnfTransform.

4 files changed, 37 insertions, 13 deletions

diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
index 6434315..d98aaa3 100644
--- a/src/main/scala/scala/async/internal/AnfTransform.scala
+++ b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -187,15 +187,24 @@ private[async] trait AnfTransform {
                       val valDef = defineVal(argName, expr1, expr1.pos)
                       require(valDef.tpe != null, valDef)
                       val stats1 = stats :+ valDef
-                      //stats1.foreach(changeOwner(_, currentOwner, currentOwner.owner))
-                      (stats1, gen.stabilize(gen.mkAttributedIdent(valDef.symbol)))
+                      (stats1, atPos(tree.pos.makeTransparent)(gen.stabilize(gen.mkAttributedIdent(valDef.symbol))))
                   }
               }
-            val applied = treeInfo.dissectApplied(tree)
-            val core = if (targs.isEmpty) simpleFun else treeCopy.TypeApply(applied.callee, simpleFun, targs)
-            val newApply = argExprss.foldLeft(core)(Apply(_, _)).setSymbol(tree.symbol)
-            val typedNewApply = localTyper.typedPos(tree.pos)(newApply).setType(tree.tpe)
+
+            def copyApplied(tree: Tree, depth: Int): Tree = {
+              tree match {
+                case TypeApply(_, targs) => treeCopy.TypeApply(tree, simpleFun, targs)
+                case _ if depth == 0     => simpleFun
+                case Apply(fun, args)    =>
+                  val newTypedArgs = map2(args.map(_.pos), argExprss(depth - 1))((pos, arg) => localTyper.typedPos(pos)(arg))
+                  treeCopy.Apply(tree, copyApplied(fun, depth - 1), newTypedArgs)
+              }
+            }
+
+            val typedNewApply = copyApplied(tree, treeInfo.dissectApplied(tree).applyDepth)
+
             funStats ++ argStatss.flatten.flatten :+ typedNewApply
+
           case Block(stats, expr)                                    =>
             (stats :+ expr).flatMap(linearize.transformToList)
 
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index 2582c91..70237bc 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -111,7 +111,7 @@ private[async] trait TransformUtils {
     args match {
       case args :+ Typed(tree, Ident(tpnme.WILDCARD_STAR)) =>
         val (a, argExprs :+ lastArgExpr) = (args :+ tree).zipWithIndex.map(f.tupled).unzip
-        val exprs = argExprs :+ Typed(lastArgExpr, Ident(tpnme.WILDCARD_STAR)).setPos(lastArgExpr.pos)
+        val exprs = argExprs :+ atPos(lastArgExpr.pos.makeTransparent)(Typed(lastArgExpr, Ident(tpnme.WILDCARD_STAR)))
         (a, exprs)
       case args                                            =>
         args.zipWithIndex.map(f.tupled).unzip
diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala
index f1cb251..770c0f9 100644
--- a/src/test/scala/scala/async/TreeInterrogation.scala
+++ b/src/test/scala/scala/async/TreeInterrogation.scala
@@ -72,13 +72,11 @@ object TreeInterrogation extends App {
     import scala.async.Async._
     val tree = tb.parse(
       """ import _root_.scala.async.internal.AsyncId.{async, await}
-        | def foo[T](a0: Int)(b0: Int*) = s"a0 = $a0, b0 = ${b0.head}"
-        | val res = async {
-        |   var i = 0
-        |   def get = async {i += 1; i}
-        |   foo[Int](await(get))(await(get) :: Nil : _*)
+        | import reflect.runtime.universe._
+        | async {
+        |   implicit def view(a: Int): String = ""
+        |   await(0).length
         | }
-        | res
         | """.stripMargin)
     println(tree)
     val tree1 = tb.typeCheck(tree.duplicate)
diff --git a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
index bd2aa97..595ed63 100644
--- a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
+++ b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
@@ -377,4 +377,21 @@ class AnfTransformSpec {
       x
     } mustBe 1
   }
+
+  @Test
+  def awaitInImplicitApply() {
+    val tb = mkToolbox(s"-cp ${toolboxClasspath}")
+    val tree = tb.typeCheck(tb.parse {
+      """
+        | import language.implicitConversions
+        | import _root_.scala.async.internal.AsyncId.{async, await}
+        | implicit def view(a: Int): String = ""
+        | async {
+        |   await(0).length
+        | }
+      """.stripMargin
+    })
+    val applyImplicitView = tree.collect { case x if x.getClass.getName.endsWith("ApplyImplicitView") => x }
+    applyImplicitView.map(_.toString) mustBe List("view(a$1)")
+  }
 }