Move needsForwarder logic from ResolveSuper to MixinOps.

We'd like to make it reusable for a phase that treats Scala2 traits.

1 files changed, 2 insertions, 8 deletions

diff --git a/src/dotty/tools/dotc/transform/ResolveSuper.scala b/src/dotty/tools/dotc/transform/ResolveSuper.scala
index 0f1c448d9..d23e81ab3 100644
--- a/src/dotty/tools/dotc/transform/ResolveSuper.scala
+++ b/src/dotty/tools/dotc/transform/ResolveSuper.scala
@@ -80,15 +80,9 @@ class ResolveSuper extends MiniPhaseTransform with IdentityDenotTransformer { th
       for (superAcc <- mixin.info.decls.filter(_ is SuperAccessor).toList)
         yield polyDefDef(implementation(superAcc.asTerm), forwarder(rebindSuper(cls, superAcc)))
 
-    def methodOverrides(mixin: ClassSymbol): List[Tree] = {
-      def isOverridden(meth: Symbol) = meth.overridingSymbol(cls).is(Method, butNot = Deferred)
-      def needsDisambiguation(meth: Symbol): Boolean =
-        meth.is(Method, butNot = PrivateOrAccessorOrDeferred) &&
-          !isOverridden(meth) &&
-          !meth.allOverriddenSymbols.forall(_ is Deferred)
-      for (meth <- mixin.info.decls.toList if needsDisambiguation(meth))
+    def methodOverrides(mixin: ClassSymbol): List[Tree] =
+      for (meth <- mixin.info.decls.toList if needsForwarder(meth))
         yield polyDefDef(implementation(meth.asTerm), forwarder(meth))
-    }
 
     val overrides = mixins.flatMap(mixin => superAccessors(mixin) ::: methodOverrides(mixin))