Remove manual mixins in JFunctionN.v2.12.0-M3-dc9effe

These manual mixins were forwarding to the impl classes have
just been removed. We can now rely on default methods instead.

Update Tests:

 - Fix test/files/pos/t1237.scala, we can't have an outer field
   in an interface, always use the outer method.
 - Don't crash on meaningless trait early init fields
   test/files/neg/t2796.scala
 - Remove impl class relate parts of inner class test
 - Remove impl class relate parts of elidable test
 - Remove impl class related reflection test.
 - Remove test solely about trait impl classes renaming
 - Update check file with additional stub symbol error
 - Disable unstable parts of serialization test.
    - TODO explain, and reset the expectation

2 files changed, 2 insertions, 23 deletions

diff --git a/test/files/jvm/innerClassAttribute/Test.scala b/test/files/jvm/innerClassAttribute/Test.scala
index 490128d5d2..1ac5a2dcf6 100644
--- a/test/files/jvm/innerClassAttribute/Test.scala
+++ b/test/files/jvm/innerClassAttribute/Test.scala
@@ -125,7 +125,6 @@ object Test extends BytecodeTest {
   def testA6() = {
     val List(tt1) = innerClassNodes("A6")
     assertMember(tt1, "A6", "TT", flags = publicAbstractInterface)
-    val List() = innerClassNodes("A6$class")
     val List(tt2) = innerClassNodes("A6$TT")
     assertMember(tt2, "A6", "TT", flags = publicAbstractInterface)
   }
@@ -351,25 +350,19 @@ object Test extends BytecodeTest {
     assertMember(ownInnerClassNode("SI_9124$O$"), "SI_9124", "O$")
   }
 
+  // Note: the new trait encoding removed impl classes, so this test name doesn't make sense.
+  // But I've left it here as there were some tests remaining that are still relevant.
   def testImplClassesTopLevel() {
     val classes = List(
       "ImplClassesAreTopLevel$$anon$14",
       "ImplClassesAreTopLevel$$anon$15",
       "ImplClassesAreTopLevel$$anon$16",
-      "ImplClassesAreTopLevel$B1$class",
       "ImplClassesAreTopLevel$B1",
-      "ImplClassesAreTopLevel$B2$1$class",
       "ImplClassesAreTopLevel$B2$1",
-      "ImplClassesAreTopLevel$B3$1$class",
       "ImplClassesAreTopLevel$B3$1",
-      "ImplClassesAreTopLevel$B4$class",
       "ImplClassesAreTopLevel$B4$1",
-      "ImplClassesAreTopLevel$class",
       "ImplClassesAreTopLevel")
 
-    classes.filter(_.endsWith("$class")).foreach(assertNoEnclosingMethod)
-    classes.flatMap(innerClassNodes).foreach(icn => assert(!icn.name.endsWith("$class"), icn))
-
     assertNoEnclosingMethod("ImplClassesAreTopLevel$B1") // member, no encl meth attr
 
     // no encl meth, but encl class
@@ -391,17 +384,11 @@ object Test extends BytecodeTest {
     testInner("ImplClassesAreTopLevel$$anon$15", an15, b2)
     testInner("ImplClassesAreTopLevel$$anon$16", an16, b4)
 
-    testInner("ImplClassesAreTopLevel$B1$class", b1)
-    testInner("ImplClassesAreTopLevel$B2$1$class", b2)
-    testInner("ImplClassesAreTopLevel$B3$1$class", b3)
-    testInner("ImplClassesAreTopLevel$B4$class", b4)
-
     testInner("ImplClassesAreTopLevel$B1", b1)
     testInner("ImplClassesAreTopLevel$B2$1", b2)
     testInner("ImplClassesAreTopLevel$B3$1", b3)
     testInner("ImplClassesAreTopLevel$B4$1", b4)
 
-    testInner("ImplClassesAreTopLevel$class", an14, an15, an16)
     testInner("ImplClassesAreTopLevel", an14, an15, an16, b1, b2, b3, b4)
   }
 
diff --git a/test/files/jvm/javaReflection.check b/test/files/jvm/javaReflection.check
index 5f7aafe77c..9e9fe36d14 100644
--- a/test/files/jvm/javaReflection.check
+++ b/test/files/jvm/javaReflection.check
@@ -162,15 +162,7 @@ AT$D$ / AT.D$ (canon) / D$ (simple)
 - declared cls: List()
 - enclosing   : interface AT (declaring cls) / interface AT (cls) / null (constr) / null (meth)
 - properties  : false (local) / true (member)
-AT$class / AT$class (canon) / AT$class (simple)
-- declared cls: List()
-- enclosing   : null (declaring cls) / null (cls) / null (constr) / null (meth)
-- properties  : false (local) / false (member)
 T / T (canon) / T (simple)
 - declared cls: List()
 - enclosing   : null (declaring cls) / null (cls) / null (constr) / null (meth)
 - properties  : false (local) / false (member)
-T$class / T$class (canon) / T$class (simple)
-- declared cls: List()
-- enclosing   : null (declaring cls) / null (cls) / null (constr) / null (meth)
-- properties  : false (local) / false (member)