diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-12-10 13:07:01 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-12-10 13:07:01 +1000 |
commit | 49514746c007da44a57f17730e3f6f353456d37c (patch) | |
tree | 04e77a135318944d7010e53dc3149d477b713c93 /src/main | |
parent | 38416aec4cbe5b47153ae5f634e420bc00b2292d (diff) | |
parent | 13bc13dfe78667f6a14352daebea524a2809d078 (diff) | |
download | scala-async-49514746c007da44a57f17730e3f6f353456d37c.tar.gz scala-async-49514746c007da44a57f17730e3f6f353456d37c.tar.bz2 scala-async-49514746c007da44a57f17730e3f6f353456d37c.zip |
Merge pull request #95 from gnovark/topic/absType-crash
Fix regression around await of non-class type
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index 9ae48ed..5569ade 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -331,9 +331,10 @@ private[async] trait TransformUtils { (cls.info.decls.find(sym => sym.isMethod && sym.asTerm.isParamAccessor) getOrElse NoSymbol) def mkZero(tp: Type): Tree = { - if (tp.typeSymbol.asClass.isDerivedValueClass) { - val argZero = mkZero(derivedValueClassUnbox(tp.typeSymbol).infoIn(tp).resultType) - val baseType = tp.baseType(tp.typeSymbol) // use base type here to dealias / strip phantom "tagged types" etc. + val tpSym = tp.typeSymbol + if (tpSym.isClass && tpSym.asClass.isDerivedValueClass) { + val argZero = mkZero(derivedValueClassUnbox(tpSym).infoIn(tp).resultType) + val baseType = tp.baseType(tpSym) // use base type here to dealias / strip phantom "tagged types" etc. // By explicitly attributing the types and symbols here, we subvert privacy. // Otherwise, ticket86PrivateValueClass would fail. @@ -342,7 +343,7 @@ private[async] trait TransformUtils { // q"new ${valueClass}[$..targs](argZero)" val target: Tree = gen.mkAttributedSelect( c.typecheck(atMacroPos( - New(TypeTree(baseType)))), tp.typeSymbol.asClass.primaryConstructor) + New(TypeTree(baseType)))), tpSym.asClass.primaryConstructor) val zero = gen.mkMethodCall(target, argZero :: Nil) |