Drop $$local whan mangling fields

Author: odersky

compiler/src/dotty/tools/dotc/core/NameKinds.scala

@@ -351,7 +351,9 @@ object NameKinds {
   val ProtectedSetterName = new PrefixNameKind(PROTECTEDSETTER, "protected$set") // dubious encoding, kept for Scala2 compatibility
   val AvoidClashName = new SuffixNameKind(AVOIDCLASH, "$_avoid_name_clash_$")
   val DirectMethodName = new SuffixNameKind(DIRECT, "$direct") { override def definesNewName = true }
-  val FieldName = new SuffixNameKind(FIELD, "$$local")
+  val FieldName = new SuffixNameKind(FIELD, "$$local") {
+      override def mkString(underlying: TermName, info: ThisInfo) = underlying.toString
+  }
   val ExtMethName = new SuffixNameKind(EXTMETH, "$extension")
   val ModuleVarName = new SuffixNameKind(OBJECTVAR, "$module")
   val ModuleClassName = new SuffixNameKind(OBJECTCLASS, "$", optInfoString = "ModuleClass")

tests/run/paramForwarding.check

@@ -1,16 +1,16 @@
 B:
-private final int B.theValue$$local
-private final int B.theValueInB$$local
+private final int B.theValue
+private final int B.theValueInB
 Bz:
-private final int Bz.theValue$$local
-private final int Bz.theValueInBz$$local
+private final int Bz.theValue
+private final int Bz.theValueInBz
 C:
 
 D:
-private final int D.other$$local
+private final int D.other
 NonVal:
 
 X:
-private final int X.theValue$$local
+private final int X.theValue
 Y:
 

tests/run/paramForwarding_separate.check

@@ -1,5 +1,5 @@
 # Fields in A:
-private final int A.member$$local
+private final int A.member
 # Fields in SubA:
 
 # Fields in B:

tests/run/paramForwarding_together.check

@@ -1,5 +1,5 @@
 # Fields in A:
-private final int A.member$$local
+private final int A.member
 # Fields in SubA:
 
 # Fields in B:

tests/run/paramForwarding_together_b.check

@@ -1,5 +1,5 @@
 # Fields in A:
-private final int A.member$$local
+private final int A.member
 # Fields in SubA:
 
 # Fields in B:

tests/run/statics.scala

@@ -2,18 +2,18 @@ import scala.annotation.static
 
 class Foo{
   class Bar {
-    def qwa = 
+    def qwa =
      Bar.field
          // 0: invokestatic  #31                 // Method Foo$Bar$.field:()I
          // 3: ireturn
   }
   object Bar {
-     @static 
+     @static
      val field = 1
    }
 }
 
-object Foo{ 
+object Foo{
  @static
  def method = 1
 
@@ -35,6 +35,6 @@ object Test {
 }
 
 class WithLazies{
-  @volatile lazy val s = 1 
+  @volatile lazy val s = 1
   //         98: getstatic     #30                 // Field WithLazies$.OFFSET$0:J
 }

tests/run/variable-pattern-access.check

@@ -1,6 +1,6 @@
 # Fields of A:
-private final int A.a$$local
-private final int A.b$$local
+private final int A.a
+private final int A.b
 private final scala.Tuple2 A.$1$
 # Methods of A:
 public int A.a()