Adapt name tags for protected

Protected accessor names are no longer pickled, but inline accessors are.
Adapt name tags accordingly. Bump major Tasty version.

Author: odersky

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

@@ -353,8 +353,8 @@ object NameKinds {
 
   val SuperAccessorName = new PrefixNameKind(SUPERACCESSOR, "super$")
   val InitializerName = new PrefixNameKind(INITIALIZER, "initial$")
-  val ProtectedAccessorName = new PrefixNameKind(PROTECTEDACCESSOR, "protected$")
-  val ProtectedSetterName = new PrefixNameKind(PROTECTEDSETTER, "protected$set") // dubious encoding, kept for Scala2 compatibility
+  val ProtectedGetterName = new PrefixNameKind(PROTECTEDGETTER, "protected_get$")
+  val ProtectedSetterName = new PrefixNameKind(PROTECTEDSETTER, "protected_set$")
   val InlineGetterName = new PrefixNameKind(INLINEGETTER, "inline_get$")
   val InlineSetterName = new PrefixNameKind(INLINESETTER, "inline_set$")
 
@@ -388,9 +388,12 @@ object NameKinds {
     def infoString: String = "Signed"
   }
 
-  /** Possible name kinds of a method that comes from Scala2 pickling info. */
+  /** Possible name kinds of a method that comes from Scala2 pickling info.
+   *  and that need to be unmangled. Note: Scala2 protected accessors and setters
+   *  can be left mangled, so they are not included in thus list.
+   */
   val Scala2MethodNameKinds: List[NameKind] =
-    List(DefaultGetterName, ExtMethName, UniqueExtMethName, ProtectedAccessorName, ProtectedSetterName)
+    List(DefaultGetterName, ExtMethName, UniqueExtMethName)
 
   def simpleNameKindOfTag      : collection.Map[Int, ClassifiedNameKind] = simpleNameKinds
   def qualifiedNameKindOfTag   : collection.Map[Int, QualifiedNameKind]  = qualifiedNameKinds

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

@@ -15,6 +15,10 @@ object NameTags extends TastyFormat.NameTags {
                                 // outer accessor that will be filled in by ExplicitOuter.
                                 // <num> indicates the number of hops needed to select the outer field.
 
+  final val PROTECTEDGETTER = 24 // The name of a protected getter `protected_get$<name>` created by ProtectedAccessors.
+
+  final val PROTECTEDSETTER = 25 // The name of a protected setter `protected_set$<name>` created by ProtectedAccessors.
+
   final val INITIALIZER = 26    // A mixin initializer method
 
   final val AVOIDCLASH = 27     // Adds a suffix to avoid a name clash;
@@ -47,7 +51,9 @@ object NameTags extends TastyFormat.NameTags {
     case OUTERSELECT => "OUTERSELECT"
 
     case SUPERACCESSOR => "SUPERACCESSOR"
-    case PROTECTEDACCESSOR => "PROTECTEDACCESSOR"
+    case INLINEGETTER => "INLINEGETTER"
+    case INLINESETTER => "INLINESETTER"
+    case PROTECTEDGETTER => "PROTECTEDGETTER"
     case PROTECTEDSETTER => "PROTECTEDSETTER"
     case INITIALIZER => "INITIALIZER"
     case AVOIDCLASH => "AVOIDCLASH"

compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala

@@ -39,8 +39,8 @@ Macro-format:
                   VARIANT           Length underlying_NameRef variance_Nat      // 0: Contravariant, 1: Covariant
 
                   SUPERACCESSOR     Length underlying_NameRef
-                  PROTECTEDACCESSOR Length underlying_NameRef
-                  PROTECTEDSETTER   Length underlying_NameRef
+                  INLINEGETTER      Length underlying_NameRef
+                  INLINESETTER      Length underlying_NameRef
                   OBJECTCLASS       Length underlying_NameRef
 
                   SIGNED            Length original_NameRef resultSig_NameRef paramSig_NameRef*
@@ -226,8 +226,8 @@ Standard Section: "Positions" Assoc*
 object TastyFormat {
 
   final val header = Array(0x5C, 0xA1, 0xAB, 0x1F)
-  val MajorVersion = 7
-  val MinorVersion = 1
+  val MajorVersion = 8
+  val MinorVersion = 0
 
   /** Tags used to serialize names */
   class NameTags {
@@ -252,18 +252,12 @@ object TastyFormat {
 
     final val SUPERACCESSOR = 20     // The name of a super accessor `super$name` created by SuperAccesors.
 
-    final val PROTECTEDACCESSOR = 21 // The name of a protected accessor `protected$<name>` created by SuperAccesors.
+    final val INLINEGETTER = 21    // The name of an inline getter `inline_get$name`
 
-    final val PROTECTEDSETTER = 22   // The name of a protected setter `protected$set<name>` created by SuperAccesors.
-                                     // This is a dubious encoding for its risk for ambiguity.
-                                     // It is kept for Scala-2 compatibility.
+    final val INLINESETTER = 22     // The name of an inline setter `inline_set$name`
 
     final val OBJECTCLASS = 23       // The name of an object class (or: module class) `<name>$`.
 
-    final val INLINEGETTER = 24     // The name of an inline getter `inline_get$name`
-
-    final val INLINESETTER = 25     // The name of an inline setter `inline_set$name`
-
     final val SIGNED = 63            // A pair of a name and a signature, used to idenitfy
                                      // possibly overloaded methods.
   }

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

@@ -20,7 +20,7 @@ class ProtectedAccessors extends MiniPhase {
   override def phaseName = ProtectedAccessors.name
 
   object Accessors extends AccessProxies {
-    def getterName = ProtectedAccessorName
+    def getterName = ProtectedGetterName
     def setterName = ProtectedSetterName
 
     val insert = new Insert {

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

@@ -11,7 +11,7 @@ import Types._, Contexts._, Constants._, Names._, NameOps._, Flags._, DenotTrans
 import SymDenotations._, Symbols._, StdNames._, Annotations._, Trees._, Scopes._, Denotations._
 import util.Positions._
 import Decorators._
-import NameKinds.{ProtectedAccessorName, ProtectedSetterName, OuterSelectName, SuperAccessorName}
+import NameKinds.{ProtectedGetterName, ProtectedSetterName, OuterSelectName, SuperAccessorName}
 import Symbols._, TypeUtils._, SymUtils._
 
 /** This class performs the following functions:
@@ -166,7 +166,7 @@ class SuperAccessors(thisPhase: DenotTransformer) {
       assert(clazz.exists, sym)
       ctx.debuglog("Decided for host class: " + clazz)
 
-      val accName = ProtectedAccessorName(sym.name)
+      val accName = ProtectedGetterName(sym.name)
 
       // if the result type depends on the this type of an enclosing class, the accessor
       // has to take an object of exactly this type, otherwise it's more general
@@ -206,7 +206,7 @@ class SuperAccessors(thisPhase: DenotTransformer) {
 
     def isProtectedAccessor(tree: Tree)(implicit ctx: Context): Boolean = tree match {
       case Apply(TypeApply(Select(_, name), _), qual :: Nil) =>
-        name.is(ProtectedAccessorName) || name.is(ProtectedSetterName)
+        name.is(ProtectedGetterName) || name.is(ProtectedSetterName)
       case _ => false
     }
 
@@ -221,7 +221,7 @@ class SuperAccessors(thisPhase: DenotTransformer) {
       assert(clazz.exists, sym)
       ctx.debuglog("Decided for host class: " + clazz)
 
-      val accName = ProtectedAccessorName(sym.name)
+      val accName = ProtectedGetterName(sym.name)
 
       // if the result type depends on the this type of an enclosing class, the accessor
       // has to take an object of exactly this type, otherwise it's more general