Merge pull request #2999 from dotty-staging/fix-#2964

Fix #2964: Refresh names for anonymous classes

Author: allanrenucci

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

@@ -100,7 +100,8 @@ class Compiler {
            new ElimStaticThis,      // Replace `this` references to static objects by global identifiers
            new Flatten,             // Lift all inner classes to package scope
            new RestoreScopes),      // Repair scopes rendered invalid by moving definitions in prior phases of the group
-      List(new TransformWildcards,  // Replace wildcards with default values
+      List(new RenameLifted,        // Renames lifted classes to local numbering scheme
+           new TransformWildcards,  // Replace wildcards with default values
            new MoveStatics,         // Move static methods to companion classes
            new ExpandPrivate,       // Widen private definitions accessed from nested classes
            new SelectStatic,        // get rid of selects that would be compiled into GetStatic

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

@@ -0,0 +1,46 @@
+package dotty.tools.dotc.transform
+
+import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Decorators._
+import dotty.tools.dotc.core.DenotTransformers.SymTransformer
+import dotty.tools.dotc.core.Flags._
+import dotty.tools.dotc.core.NameKinds._
+import dotty.tools.dotc.core.Names._
+import dotty.tools.dotc.core.Phases
+import dotty.tools.dotc.core.SymDenotations.SymDenotation
+import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.transform.TreeTransforms.MiniPhaseTransform
+
+/** Renames lifted classes to local numbering scheme */
+class RenameLifted extends MiniPhaseTransform with SymTransformer { thisTransformer =>
+
+  override def phaseName = "renameLifted"
+
+  override def runsAfterGroupsOf: Set[Class[_ <: Phases.Phase]] = Set(classOf[RestoreScopes])
+
+  def transformSym(ref: SymDenotation)(implicit ctx: Context): SymDenotation =
+    if (needsRefresh(ref.symbol)) ref.copySymDenotation(name = refreshedName(ref.symbol))
+    else ref
+
+  /** If the name of the symbol with a unique name needs to be refreshed
+   *    - if it is a lifted class
+   *    - if it is a lifted method
+   */
+  private def needsRefresh(sym: Symbol)(implicit ctx: Context): Boolean =
+    (sym.isClass || sym.is(Private | Method | JavaStatic)) && sym.name.is(UniqueName)
+
+  /** Refreshes the number of the name based on the full name of the symbol */
+  private def refreshedName(sym: Symbol)(implicit ctx: Context): Name = {
+    def rewriteUnique: PartialFunction[Name, Name] = {
+      case name: DerivedName if name.info.kind == UniqueName =>
+        val fullName = (sym.owner.fullName.toString + name.underlying).toTermName
+        val freshName = UniqueName.fresh(fullName)
+        val info = freshName.asInstanceOf[DerivedName].info
+        DerivedName(name.underlying.rewrite(rewriteUnique), info)
+      case DerivedName(underlying, info: QualifiedInfo) =>
+        underlying.rewrite(rewriteUnique).derived(info)
+    }
+
+    sym.name.rewrite(rewriteUnique)
+  }
+}

tests/run/i2738.check

@@ -1,8 +1,8 @@
 foo
-bar$1
-foo
 bar$2
+foo
+bar$1
 baz
-Test$qux$2$
+Test$qux$1$
 baz
-Test$qux$4$
+Test$qux$2$

tests/run/i2964.check

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

tests/run/i2964.scala

@@ -0,0 +1,27 @@
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new Foo
+    new Bar
+    new Baz
+  }
+}
+
+class Foo {
+  new Object {
+    println(this.getClass) // Foo$$anon$1
+  }
+}
+class Bar {
+  new Object {
+    println(this.getClass) // Bar$$anon$1
+  }
+  new Object {
+    println(this.getClass) // Bar$$anon$2
+  }
+}
+class Baz {
+  new Object {
+    println(this.getClass) // Baz$$anon$1
+  }
+}

tests/run/i2964b.check

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

tests/run/i2964b.scala

@@ -0,0 +1,27 @@
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    Foo
+    Bar
+    Baz
+  }
+}
+
+object Foo {
+  new Object {
+    println(this.getClass) // Foo$$anon$1
+  }
+}
+object Bar {
+  new Object {
+    println(this.getClass) // Bar$$anon$1
+  }
+  new Object {
+    println(this.getClass) // Bar$$anon$2
+  }
+}
+object Baz {
+  new Object {
+    println(this.getClass) // Baz$$anon$1
+  }
+}

tests/run/i2964c.check

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

tests/run/i2964c.scala

@@ -0,0 +1,41 @@
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new Foo().foo
+    new Bar().bar
+    new Bar().bar2
+    new Baz().baz
+  }
+}
+
+class Foo {
+  def foo: Unit = {
+    class Inner {
+      println(this.getClass)
+    }
+    new Inner
+  }
+}
+class Bar {
+  def bar: Unit = {
+    class Inner {
+      println(this.getClass)
+    }
+    new Inner
+  }
+
+  def bar2: Unit = {
+    class Inner {
+      println(this.getClass)
+    }
+    new Inner
+  }
+}
+class Baz {
+  def baz: Unit = {
+    class Inner {
+      println(this.getClass)
+    }
+    new Inner
+  }
+}

tests/run/i2964d.check

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