Add impl restriction related to invokespecial to Java parents

Author: retronym

src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala

@@ -1077,10 +1077,15 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
           if (needsInterfaceCall(receiverClass)) bc.invokeinterface(receiverName, jname, mdescr, pos)
           else                               bc.invokevirtual  (receiverName, jname, mdescr, pos)
         case Super   =>
-          if (receiverClass.isTraitOrInterface) {
+          if (receiverClass.isTrait && method.owner.isTrait && !method.owner.isJavaDefined) {
             val staticDesc = MethodBType(typeToBType(method.owner.info) :: method.info.paramTypes.map(typeToBType), typeToBType(method.info.resultType)).descriptor
             bc.invokestatic(receiverName, jname, staticDesc, pos)
-          } else bc.invokespecial  (receiverName, jname, mdescr, pos)
+          } else {
+            if (receiverClass.isTraitOrInterface && !cnode.interfaces.contains(receiverName))
+              reporter.error(pos, s"Implementation restriction: unable to emit a super call to ${receiverName}.${method.name} from ${cnode.name}. Add $receiverName as a direct parent of ${cnode.name}")
+            else
+              bc.invokespecial  (receiverName, jname, mdescr, pos)
+          }
       }
 
       bmType.returnType

src/compiler/scala/tools/nsc/transform/Mixin.scala

@@ -345,6 +345,11 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL {
               reporter.error(clazz.pos, "Member %s of mixin %s is missing a concrete super implementation.".format(
                 mixinMember.alias, mixinClass))
             case alias1 =>
+              val temp = alias1
+              if (temp.owner.isJavaDefined && temp.owner.isInterface && !clazz.parentSymbols.contains(temp.owner)) {
+                val suggestedParent = exitingTyper(clazz.info.baseType(temp.owner))
+                reporter.error(clazz.pos, s"Unable to implement a super accessor required by trait ${mixinClass.name} unless $suggestedParent is directly extended by $clazz.")
+              }
               superAccessor.asInstanceOf[TermSymbol] setAlias alias1
           }
         }

test/files/neg/trait-defaults-super.check

@@ -0,0 +1,4 @@
+trait-defaults-super.scala:14: error: Unable to implement a super accessor required by trait T unless Iterable[String] is directly extended by class C
+class C extends T
+      ^
+one error found

test/files/neg/trait-defaults-super.scala

@@ -0,0 +1,21 @@
+trait T extends java.lang.Iterable[String] {
+
+  override def spliterator(): java.util.Spliterator[String] = {
+    super[Iterable].spliterator
+    super.spliterator
+    null
+  }
+  def foo = {
+    super[Iterable].spliterator
+    super.spliterator
+  }
+  def iterator(): java.util.Iterator[String] = java.util.Collections.emptyList().iterator()
+}
+class C extends T
+object Test {
+  def main(args: Array[String]): Unit = {
+    val t: T = new C
+    t.spliterator
+    t.foo
+  }
+}

test/files/pos/trait-defaults-super.scala

@@ -0,0 +1,21 @@
+trait T extends java.lang.Iterable[String] {
+
+  override def spliterator(): java.util.Spliterator[String] = {
+    super[Iterable].spliterator
+    super.spliterator
+    null
+  }
+  def foo = {
+    super[Iterable].spliterator
+    super.spliterator
+  }
+  def iterator(): java.util.Iterator[String] = java.util.Collections.emptyList().iterator()
+}
+class C extends T with java.lang.Iterable[String] // super accessor is okay with Iterable as a direct parent
+object Test {
+  def main(args: Array[String]): Unit = {
+    val t: T = new C
+    t.spliterator
+    t.foo
+  }
+}