diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-07-21 12:28:51 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-07-21 12:28:51 +0200 |
commit | 154a2d7d7fab1b6db940a01c212c8de0138ae930 (patch) | |
tree | 8558bd00a0553c71a3341e0bf749e40cec9e1558 /src | |
parent | 75ef24db7c9de170681d28a48f3e3ec2a47f7292 (diff) | |
parent | 1df849070694756533003c9c331cd04d0c3136e8 (diff) | |
download | scala-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')
3 files changed, 70 insertions, 4 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 diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index f228e1d..bef52f1 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -100,7 +100,7 @@ private[async] trait TransformUtils { case ld: LabelDef => ld.symbol }.toSet t.exists { - case rt: RefTree => !(labelDefs contains rt.symbol) + case rt: RefTree => rt.symbol != null && rt.symbol.isLabel && !(labelDefs contains rt.symbol) case _ => false } } diff --git a/src/test/scala/scala/async/run/ifelse4/IfElse4.scala b/src/test/scala/scala/async/run/ifelse4/IfElse4.scala new file mode 100644 index 0000000..b0ecf13 --- /dev/null +++ b/src/test/scala/scala/async/run/ifelse4/IfElse4.scala @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com> + */ + +package scala.async +package run +package ifelse4 + +import language.{reflectiveCalls, postfixOps} +import scala.concurrent.{Future, ExecutionContext, future, Await} +import scala.concurrent.duration._ +import scala.async.Async.{async, await} +import org.junit.Test + + +class TestIfElse4Class { + + import ExecutionContext.Implicits.global + + class F[A] + class S[A](val id: String) + trait P + + case class K(f: F[_]) + + def result[A](f: F[A]) = async { + new S[A with P]("foo") + } + + def run(k: K) = async { + val res = await(result(k.f)) + // these triggered a crash with mismatched existential skolems + // found : S#10272[_$1#10308 with String#137] where type _$1#10308 + // required: S#10272[_$1#10311 with String#137] forSome { type _$1#10311 } + + // This variation of the crash could be avoided by fixing the over-eager + // generation of states in `If` nodes, which was caused by a bug in label + // detection code. + if(true) { + identity(res) + } + + // This variation remained after the aforementioned fix, however. + // It was fixed by manually typing the `Assign(liftedField, rhs)` AST, + // which is how we avoid these problems through the rest of the ANF transform. + if(true) { + identity(res) + await(result(k.f)) + } + res + } +} + +class IfElse4Spec { + + @Test + def `await result with complex type containing skolem`() { + val o = new TestIfElse4Class + val fut = o.run(new o.K(null)) + val res = Await.result(fut, 2 seconds) + res.id mustBe ("foo") + } +} |