From ee5639a8d90538c162f41cbb6d88007462311863 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Fri, 21 Aug 2015 14:17:16 +0200
Subject: Mixin: class defined abstract members take precedence over interface
 defined.

In case we have an class-defined abstract member implemented
 by a trait we need to create an explicit forwarder.
---
 src/dotty/tools/dotc/transform/MixinOps.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/dotty/tools/dotc/transform/MixinOps.scala b/src/dotty/tools/dotc/transform/MixinOps.scala
index 3685a00fc..f56c83f96 100644
--- a/src/dotty/tools/dotc/transform/MixinOps.scala
+++ b/src/dotty/tools/dotc/transform/MixinOps.scala
@@ -38,10 +38,12 @@ class MixinOps(cls: ClassSymbol, thisTransform: DenotTransformer)(implicit ctx:
   def isCurrent(sym: Symbol) = cls.info.member(sym.name).hasAltWith(_.symbol == sym)
 
   def needsForwarder(meth: Symbol): Boolean = {
-    def needsDisambiguation = !meth.allOverriddenSymbols.forall(_ is Deferred)
+    lazy val overridenSymbols = meth.allOverriddenSymbols
+    def needsDisambiguation = !overridenSymbols.forall(_ is Deferred)
+    def hasNonInterfaceDefinition = overridenSymbols.forall(!_.owner.is(Trait))
     meth.is(Method, butNot = PrivateOrAccessorOrDeferred) &&
     isCurrent(meth) &&
-    (needsDisambiguation || meth.owner.is(Scala2x))
+    (needsDisambiguation || hasNonInterfaceDefinition || meth.owner.is(Scala2x))
   }
 
   final val PrivateOrAccessorOrDeferred = Private | Accessor | Deferred
-- 
cgit v1.2.3


From d17d3121fd8cbd620bbc70bb46e983b37311ba15 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Fri, 21 Aug 2015 14:18:24 +0200
Subject: Test that forwarders are correctly created.

---
 tests/run/i764.scala | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tests/run/i764.scala

diff --git a/tests/run/i764.scala b/tests/run/i764.scala
new file mode 100644
index 000000000..921bdd23b
--- /dev/null
+++ b/tests/run/i764.scala
@@ -0,0 +1,14 @@
+abstract class A {
+ def foo: Int
+}
+
+trait B {
+ def foo = 2
+}
+
+object Test extends A with B {
+  
+  def main(args: Array[String]): Unit = {
+    this.foo
+  }
+}
-- 
cgit v1.2.3