diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-31 16:26:45 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-31 16:26:45 -0700 |
commit | 96f230a0e9c254c45dc91c71b5929639e6add1f0 (patch) | |
tree | 8f4942f5bb5ed348424664367384543c5160d50b /src/compiler/scala/tools/nsc/transform/Erasure.scala | |
parent | 5654ebddb63d078f9f79dcf84fbb8489030136f6 (diff) | |
parent | e4529ca2e0091ec137c791419ae08c8da8e0aecf (diff) | |
download | scala-96f230a0e9c254c45dc91c71b5929639e6add1f0.tar.gz scala-96f230a0e9c254c45dc91c71b5929639e6add1f0.tar.bz2 scala-96f230a0e9c254c45dc91c71b5929639e6add1f0.zip |
Merge pull request #5059 from lrytz/t9702
SI-9702 Fix backend crash with classOf[T] annotation argument
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Erasure.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index ebb55afca9..ac794201a4 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -1118,7 +1118,7 @@ abstract class Erasure extends AddInterfaces case Literal(ct) if ct.tag == ClazzTag && ct.typeValue.typeSymbol != definitions.UnitClass => - val erased = ct.typeValue match { + val erased = ct.typeValue.dealiasWiden match { case tr @ TypeRef(_, clazz, _) if clazz.isDerivedValueClass => scalaErasure.eraseNormalClassRef(tr) case tpe => specialScalaErasure(tpe) } |