diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-06-06 14:24:38 +1000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-06-28 09:18:34 -0700 |
| commit | d3c0885a1a88e9d52902a527650319010d7ced67 (patch) | |
| tree | 47c0ba720bf191147ed4b379250e83ded530236c /src/compiler | |
| parent | a9bebf80aae7ab2e30d84c7cd02abef2349d59d5 (diff) | |
| download | scala-d3c0885a1a88e9d52902a527650319010d7ced67.tar.gz scala-d3c0885a1a88e9d52902a527650319010d7ced67.tar.bz2 scala-d3c0885a1a88e9d52902a527650319010d7ced67.zip | |
Don't minimize parents of java defined syms.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala b/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala index d83b4a1d85..21ea351a99 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala @@ -234,12 +234,13 @@ class BTypesFromSymbols[G <: Global](val global: G) extends BTypes { val allParents = classParents ++ classSym.annotations.flatMap(newParentForAnnotation) + val minimizedParents = if (classSym.isJavaDefined) allParents else erasure.minimizeParents(allParents) // We keep the superClass when computing minimizeParents to eliminate more interfaces. // Example: T can be eliminated from D // trait T // class C extends T // class D extends C with T - val interfaces = erasure.minimizeParents(allParents) match { + val interfaces = minimizedParents match { case superClass :: ifs if !isInterfaceOrTrait(superClass.typeSymbol) => ifs case ifs => |