Merge pull request #179 from retronym/fixup

Fix more corner cases in late expansion

3 files changed, 42 insertions, 2 deletions

diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
index 93297f7..0085554 100644
--- a/src/main/scala/scala/async/internal/AnfTransform.scala
+++ b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -118,7 +118,7 @@ private[async] trait AnfTransform {
                     case MatchEnd(ld) =>
                       deriveLabelDef(ld, branchWithAssign)
                     case blk @ Block(thenStats, thenExpr) =>
-                      treeCopy.Block(blk, thenStats, typedAssign(thenExpr)).setType(definitions.UnitTpe)
+                      treeCopy.Block(blk, thenStats, branchWithAssign(thenExpr)).setType(definitions.UnitTpe)
                     case _ =>
                       typedAssign(t)
                   }
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index 848861c..04adf20 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -524,11 +524,51 @@ private[async] trait TransformUtils {
               treeCopy.If(tree, cond1, thenp1, elsep1)
           case Apply(fun, args) if isLabel(fun.symbol) =>
             internal.setType(treeCopy.Apply(tree, api.recur(fun), args map api.recur), UnitTpe)
+          case vd @ ValDef(mods, name, tpt, rhs) if isCaseTempVal(vd.symbol) =>
+            def addUncheckedBounds(t: Tree) = {
+              typingTransform(t, owner) {
+                (tree, api) =>
+                  internal.setType(api.default(tree), uncheckedBoundsIfNeeded(tree.tpe))
+              }
+
+            }
+            val uncheckedRhs = addUncheckedBounds(api.recur(rhs))
+            val uncheckedTpt = addUncheckedBounds(tpt)
+            internal.setInfo(vd.symbol, uncheckedBoundsIfNeeded(vd.symbol.info))
+            treeCopy.ValDef(vd, mods, name, uncheckedTpt, uncheckedRhs)
           case t => api.default(t)
         }
     }
   }
 
+  private def isExistentialSkolem(s: Symbol) = {
+    val EXISTENTIAL: Long = 1L << 35
+    internal.isSkolem(s) && (internal.flags(s).asInstanceOf[Long] & EXISTENTIAL) != 0
+  }
+  private def isCaseTempVal(s: Symbol) = {
+    s.isTerm && s.asTerm.isVal && s.isSynthetic && s.name.toString.startsWith("x")
+  }
+
+  def uncheckedBoundsIfNeeded(t: Type): Type = {
+    var quantified: List[Symbol] = Nil
+    var badSkolemRefs: List[Symbol] = Nil
+    t.foreach {
+      case et: ExistentialType =>
+        quantified :::= et.quantified
+      case TypeRef(pre, sym, args) =>
+        val illScopedSkolems = args.map(_.typeSymbol).filter(arg => isExistentialSkolem(arg) && !quantified.contains(arg))
+        badSkolemRefs :::= illScopedSkolems
+      case _ =>
+    }
+    if (badSkolemRefs.isEmpty) t
+    else t.map {
+      case tp @ TypeRef(pre, sym, args) if args.exists(a => badSkolemRefs.contains(a.typeSymbol)) =>
+        uncheckedBounds(tp)
+      case t => t
+    }
+  }
+
+
   final def mkMutableField(tpt: Type, name: TermName, init: Tree): List[Tree] = {
     if (isPastTyper) {
       // If we are running after the typer phase (ie being called from a compiler plugin)
diff --git a/src/test/scala/scala/async/run/late/LateExpansion.scala b/src/test/scala/scala/async/run/late/LateExpansion.scala
index e012df8..42506fc 100644
--- a/src/test/scala/scala/async/run/late/LateExpansion.scala
+++ b/src/test/scala/scala/async/run/late/LateExpansion.scala
@@ -476,7 +476,7 @@ abstract class LatePlugin extends Plugin {
       }
     }
 
-    override val runsAfter: List[String] = "refchecks" :: Nil
+    override val runsAfter: List[String] = "patmat" :: Nil
     override val phaseName: String = "postpatmat"
 
   })