diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-06 16:02:23 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-06 16:02:23 +1000 |
commit | 5aa390e7cd01c7564c2c78cd786f42801a3ee1f0 (patch) | |
tree | 3a5944fd737d367072ae766dddaf39fcf331f50e /src/main/scala/scala/async/internal/LiveVariables.scala | |
parent | 720153706dcb0d311f4591b30198502d9980372d (diff) | |
parent | 6353443a0adec384172c38efac3bc96b9d2cbad2 (diff) | |
download | scala-async-5aa390e7cd01c7564c2c78cd786f42801a3ee1f0.tar.gz scala-async-5aa390e7cd01c7564c2c78cd786f42801a3ee1f0.tar.bz2 scala-async-5aa390e7cd01c7564c2c78cd786f42801a3ee1f0.zip |
Merge pull request #112 from retronym/ticket/104
Avoid masking real errors with NotImplemented awaiting Future[Nothing]
Diffstat (limited to 'src/main/scala/scala/async/internal/LiveVariables.scala')
-rw-r--r-- | src/main/scala/scala/async/internal/LiveVariables.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/scala/async/internal/LiveVariables.scala b/src/main/scala/scala/async/internal/LiveVariables.scala index 5b49398..db15015 100644 --- a/src/main/scala/scala/async/internal/LiveVariables.scala +++ b/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 => val typeSym = tpe(sym).typeSymbol - (typeSym.isClass && typeSym.asClass.isPrimitive) || liftables.exists { tree => + (typeSym.isClass && (typeSym.asClass.isPrimitive || typeSym == definitions.NothingClass)) || liftables.exists { tree => !liftedSyms.contains(tree.symbol) && tree.exists(_.symbol == sym) } } |