Merge pull request #5251 from adriaanm/rebase-5177

Emit trait method bodies in statics [rebase of #5177]

1 files changed, 21 insertions, 0 deletions

diff --git a/test/files/pos/trait-defaults-super.scala b/test/files/pos/trait-defaults-super.scala
new file mode 100644
index 0000000000..8f867ab563
--- /dev/null
+++ b/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
+  }
+}