Merge pull request scala#13717 from dotty-staging/remove-rename-lifted

Remove RenameLifted phase

Author: smarter

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -126,7 +126,6 @@ class Compiler {
     List(new DropOuterAccessors,     // Drop unused outer accessors
          new CheckNoSuperThis,       // Check that supercalls don't contain references to `this`
          new Flatten,                // Lift all inner classes to package scope
-         new RenameLifted,           // Renames lifted classes to local numbering scheme
          new TransformWildcards,     // Replace wildcards with default values
          new MoveStatics,            // Move static methods from companion to the class itself
          new ExpandPrivate,          // Widen private definitions accessed from nested classes

compiler/src/dotty/tools/dotc/transform/RenameLifted.scala

@@ -699,7 +699,7 @@ class TestBCode extends DottyBytecodeTest {
       """.stripMargin)
 
   @Test def objectsInObjDefAreFinal =
-    checkFinalClass("Test$Foo$1$.class",
+    checkFinalClass("Test$Foo$2$.class",
       """
         |object Test {
         |  def bar() = {
@@ -709,7 +709,7 @@ class TestBCode extends DottyBytecodeTest {
       """.stripMargin)
 
   @Test def objectsInClassDefAreFinal =
-    checkFinalClass("Test$Foo$1$.class",
+    checkFinalClass("Test$Foo$2$.class",
       """
         |class Test {
         |  def bar() = {
@@ -719,7 +719,7 @@ class TestBCode extends DottyBytecodeTest {
       """.stripMargin)
 
   @Test def objectsInObjValAreFinal =
-    checkFinalClass("Test$Foo$1$.class",
+    checkFinalClass("Test$Foo$2$.class",
       """
         |class Test {
         |  val bar = {

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala

@@ -0,0 +1,15 @@
+package example {
+
+  trait Foo {
+    val (a2, a3) = ("", "")
+    val (x1, x2, x3) = ("", "", "")
+  }
+
+  class A extends Foo
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new example.A
+  }
+}

tests/run/i12759.scala

@@ -0,0 +1,39 @@
+package example {
+
+  class A1
+  class A2
+  class A3
+
+  class TypeClass[A](val value: A)
+
+  object TypeClass {
+    def apply[A](implicit a: TypeClass[A]): TypeClass[A] = a
+
+    def get2[X1: TypeClass, X2: TypeClass]: (X1, X2) = {
+      (TypeClass[X1].value, TypeClass[X2].value)
+    }
+
+    def get3[X1: TypeClass, X2: TypeClass, X3: TypeClass]: (X1, X2, X3) = {
+      (TypeClass[X1].value, TypeClass[X2].value, TypeClass[X3].value)
+    }
+
+    implicit def a1: TypeClass[A1] = new TypeClass[A1](new A1)
+    implicit def a2: TypeClass[A2] = new TypeClass[A2](new A2)
+    implicit def a3: TypeClass[A3] = new TypeClass[A3](new A3)
+  }
+
+  trait Foo {
+
+    val (a2, a3) = TypeClass.get2[A2, A3]
+
+    val (x1, x2, x3) = TypeClass.get3[A1, A2, A3]
+
+  }
+
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new example.Foo {}
+  }
+}

tests/run/i12759b.scala

@@ -1,4 +1,4 @@
-Test$qux$1$
 Test$qux$2$
+Test$qux$4$
 bar$1
 bar$2

tests/run/i2738.check

@@ -1,4 +1,4 @@
 class Foo$$anon$1
-class Bar$$anon$1
 class Bar$$anon$2
-class Baz$$anon$1
+class Bar$$anon$3
+class Baz$$anon$4

tests/run/i2964.check

@@ -1,4 +1,4 @@
 class Foo$$anon$1
-class Bar$$anon$1
 class Bar$$anon$2
-class Baz$$anon$1
+class Bar$$anon$3
+class Baz$$anon$4

tests/run/i2964b.check

@@ -1,4 +1,4 @@
 class Foo$Inner$1
-class Bar$Inner$1
 class Bar$Inner$2
-class Baz$Inner$1
+class Bar$Inner$3
+class Baz$Inner$4

tests/run/i2964c.check

@@ -1,4 +1,4 @@
-class Foo$Inner$1$
-class Bar$Inner$1$
-class Bar$Inner$2$
-class Baz$Inner$1$
+class Foo$Inner$2$
+class Bar$Inner$4$
+class Bar$Inner$6$
+class Baz$Inner$8$

tests/run/i2964d.check

@@ -1,4 +1,4 @@
 class foo.bar.Foo$$anon$1
 class foo.bar.Foo$$anon$2
-class foo.Foo$$anon$1
-class Foo$$anon$1
+class foo.Foo$$anon$3
+class Foo$$anon$4

tests/run/i2964e.check

@@ -1,2 +1,2 @@
 Foo$$anon$1
-bar.Bar$$anon$1
+bar.Bar$$anon$2

tests/run/i3000b.check

@@ -1,5 +1,5 @@
 f$1
 f$2
 f$3
-f$1
-f$2
+f$4
+f$5

tests/run/i3006.check

@@ -1,3 +1,3 @@
 bar$1
 bar$2
-bar$1
+bar$3