From a9976bd2729acbceefd46c612a08b8a42ccd9562 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 29 Jul 2016 10:30:33 +0200 Subject: Fix #1423: Fix owners of called methods in CollectSuperCalls. --- src/dotty/tools/backend/jvm/CollectSuperCalls.scala | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/dotty/tools/backend/jvm/CollectSuperCalls.scala b/src/dotty/tools/backend/jvm/CollectSuperCalls.scala index d19228364..8f9b067ba 100644 --- a/src/dotty/tools/backend/jvm/CollectSuperCalls.scala +++ b/src/dotty/tools/backend/jvm/CollectSuperCalls.scala @@ -1,7 +1,7 @@ package dotty.tools.backend.jvm -import dotty.tools.dotc.ast.tpd._ -import dotty.tools.dotc.ast.Trees +import dotty.tools.dotc.ast.tpd +import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.transform.TreeTransforms.{MiniPhaseTransform, TransformerInfo} @@ -14,17 +14,18 @@ import dotty.tools.dotc.transform.TreeTransforms.{MiniPhaseTransform, Transforme * the redundant mixin class could be required as a parent by the JVM. */ class CollectSuperCalls extends MiniPhaseTransform { + import tpd._ def phaseName: String = "collectSuperCalls" - override def transformSuper(tree: Super)(implicit ctx: Context, info: TransformerInfo): Tree = { - tree match { - case Trees.Super(qual: This, mix) if mix.nonEmpty => + override def transformSelect(tree: Select)(implicit ctx: Context, info: TransformerInfo): Tree = { + tree.qualifier match { + case Super(qual: This, mix) if mix.nonEmpty => val classSymbol = qual.symbol.asClass.classSymbol - registerSuperCall(classSymbol, tree.tpe.baseClasses.head) + registerSuperCall(classSymbol, tree.symbol.owner.asClass) case _ => } - super.transformSuper(tree) + tree } private def registerSuperCall(sym: ClassSymbol, calls: ClassSymbol)(implicit ctx: Context) = { -- cgit v1.2.3