aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-01-20 10:30:15 +1000
committerJason Zaugg <jzaugg@gmail.com>2017-10-16 07:44:56 -0500
commit505ce2292b3d58ed38f7670e05934b63df2c0450 (patch)
tree82754872c986aaaff213beacc979b1e18112b03f
parentad1905a99ddd6073afa5787e16a58e661ed8ee0b (diff)
downloadscala-async-505ce2292b3d58ed38f7670e05934b63df2c0450.tar.gz
scala-async-505ce2292b3d58ed38f7670e05934b63df2c0450.tar.bz2
scala-async-505ce2292b3d58ed38f7670e05934b63df2c0450.zip
Workaround ill-scoped exist. skolem refs emited by patmat
e.g `val x2 = Foo[$1] with Bar = boundValue` is rewritten to `val x2 = (Foo[$1] @uncheckedBounds) with Bar = boundValue` This is to have refchecks turn a blind eye to the type argument that doesn't conform the to type parameter bounds. For regular compilation, without the async transform between patmat and refchecks, bound conformance is disabled with: https://github.com/scala/scala/blob/v2.11.7/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala#L1743 Using the `uncheckedBounds` annotation is a newer, more inclusive way of acheiving the same thing: https://github.com/scala/scala/blob/v2.11.7/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala#L1677
-rw-r--r--src/main/scala/scala/async/internal/TransformUtils.scala40
-rw-r--r--src/test/scala/scala/async/run/late/LateExpansion.scala2
2 files changed, 41 insertions, 1 deletions
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"
})