Merge pull request #113 from retronym/backport/104

[backport] Avoid masking real errors with NotImplemented awaiting Future[Nothing]

Author: retronym

src/main/scala/scala/async/internal/LiveVariables.scala

@@ -56,7 +56,7 @@ trait LiveVariables {
 
     // determine which fields should be live also at the end (will not be nulled out)
     val noNull: Set[Symbol] = liftedSyms.filter { sym =>
-      sym.tpe.typeSymbol.isPrimitiveValueClass || liftables.exists { tree =>
+      sym.tpe.typeSymbol.isPrimitiveValueClass || sym.tpe.typeSymbol == definitions.NothingClass || liftables.exists { tree =>
         !liftedSyms.contains(tree.symbol) && tree.exists(_.symbol == sym)
       }
     }

src/test/scala/scala/async/run/live/LiveVariablesSpec.scala

@@ -263,4 +263,30 @@ class LiveVariablesSpec {
     }
     baz()
   }
+
+  // https://github.com/scala/async/issues/104
+  @Test def dontNullOutVarsOfTypeNothing_t104(): Unit = {
+    implicit val ec: scala.concurrent.ExecutionContext = null
+    import scala.async.Async._
+    import scala.concurrent.duration.Duration
+    import scala.concurrent.{Await, Future}
+    import scala.concurrent.ExecutionContext.Implicits.global
+    def errorGenerator(randomNum: Double) = {
+      Future {
+        if (randomNum < 0) {
+          throw new IllegalStateException("Random number was too low!")
+        } else {
+          throw new IllegalStateException("Random number was too high!")
+        }
+      }
+    }
+    def randomTimesTwo = async {
+      val num = _root_.scala.math.random
+      if (num < 0 || num > 1) {
+        await(errorGenerator(num))
+      }
+      num * 2
+    }
+    Await.result(randomTimesTwo, TestLatch.DefaultTimeout) // was: NotImplementedError
+  }
 }