aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala/async/internal/LiveVariables.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/scala/async/internal/LiveVariables.scala')
-rw-r--r--src/main/scala/scala/async/internal/LiveVariables.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/scala/async/internal/LiveVariables.scala b/src/main/scala/scala/async/internal/LiveVariables.scala
index 23063ba..5b49398 100644
--- a/src/main/scala/scala/async/internal/LiveVariables.scala
+++ b/src/main/scala/scala/async/internal/LiveVariables.scala
@@ -1,10 +1,9 @@
package scala.async.internal
-import reflect.internal.Flags._
-
trait LiveVariables {
self: AsyncMacro =>
- import global._
+ import c.universe._
+ import Flag._
/**
* Returns for a given state a list of fields (as trees) that should be nulled out
@@ -56,7 +55,8 @@ 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 =>
+ val typeSym = tpe(sym).typeSymbol
+ (typeSym.isClass && typeSym.asClass.isPrimitive) || liftables.exists { tree =>
!liftedSyms.contains(tree.symbol) && tree.exists(_.symbol == sym)
}
}