Rename Touched flag to Completing

"Touched" does not carry any obvious semantic meaning.
"Completing" reflects the intent of when the flag should
be set.

Author: anatoliykmetyuk

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

@@ -356,8 +356,8 @@ object Flags {
   /** Symbol is not a member of its owner */
   val (NonMember @ _, _, _) = newFlags(45, "<non-member>")
 
-  /** Denotation is in train of being loaded and completed, used to catch cyclic dependencies */
-  val (Touched @ _, _, _) = newFlags(48, "<touched>")
+  /** Denotation is in train of being completed, used to catch cyclic dependencies */
+  val (Completing @ _, _, _) = newFlags(48, "<completing>")
 
   /** Class has been lifted out to package level, local value has been lifted out to class level */
   val (Lifted @ _, _, _) = newFlags(51, "<lifted>")
@@ -443,7 +443,7 @@ object Flags {
   val FromStartFlags: FlagSet = commonFlags(
     Module, Package, Method, Case,
     HigherKinded, Param, ParamAccessor,
-    Scala2ExistentialCommon, Mutable, Touched, JavaStatic,
+    Scala2ExistentialCommon, Mutable, Completing, JavaStatic,
     OuterOrCovariant, LabelOrContravariant, CaseAccessor,
     Extension, NonMember, Implicit, Given, Permanent, Synthetic,
     SuperAccessorOrScala2x, Inline)

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

@@ -163,7 +163,7 @@ object SymDenotations {
     private def setMyFlags(flags: FlagSet) =
       lazy val immutableFlags = if myInfo.isInstanceOf[SymbolLoader] then AfterLoadFlags else FromStartFlags
       lazy val changedImmutableFlags = (myFlags ^ flags) & immutableFlags
-      if myFlags.is(Touched, butNot = Loading) then assert(changedImmutableFlags.isEmpty,
+      if myFlags.is(Completing, butNot = Loading) then assert(changedImmutableFlags.isEmpty,
         s"Illegal mutation of flags ${changedImmutableFlags.flagsString} on completion of $this")
       myFlags = flags
 
@@ -259,8 +259,8 @@ object SymDenotations {
         println(i"${"  " * indent}completing ${if (isType) "type" else "val"} $name")
         indent += 1
 
-        if (myFlags.is(Touched)) throw CyclicReference(this)
-        myFlags |= Touched
+        if (myFlags.is(Completing)) throw CyclicReference(this)
+        myFlags |= Completing
 
         // completions.println(s"completing ${this.debugString}")
         try completer.complete(this)(ctx.withPhase(validFor.firstPhaseId))
@@ -275,11 +275,11 @@ object SymDenotations {
         }
       }
       else {
-        if (myFlags.is(Touched)) throw CyclicReference(this)
-        myFlags |= Touched
+        if (myFlags.is(Completing)) throw CyclicReference(this)
+        myFlags |= Completing
         completer.complete(this)(ctx.withPhase(validFor.firstPhaseId))
       }
-      myFlags &~= Touched
+      myFlags &~= Completing
 
     protected[dotc] def info_=(tp: Type): Unit = {
       /* // DEBUG
@@ -398,7 +398,7 @@ object SymDenotations {
     final def isCompleted: Boolean = !myInfo.isInstanceOf[LazyType]
 
     /** The denotation is in train of being completed */
-    final def isCompleting: Boolean = myFlags.is(Touched) && !isCompleted
+    final def isCompleting: Boolean = myFlags.is(Completing) && !isCompleted
 
     /** The completer of this denotation. @pre: Denotation is not yet completed */
     final def completer: LazyType = myInfo.asInstanceOf[LazyType]
@@ -2245,7 +2245,7 @@ object SymDenotations {
 
     /** The type parameters computed by the completer before completion has finished */
     def completerTypeParams(sym: Symbol)(implicit ctx: Context): List[TypeParamInfo] =
-      if (sym.is(Touched)) Nil // return `Nil` instead of throwing a cyclic reference
+      if (sym.is(Completing)) Nil // return `Nil` instead of throwing a cyclic reference
       else sym.info.typeParams
 
     def decls: Scope = myDecls

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

@@ -345,7 +345,7 @@ trait Symbols { this: Context =>
         copy.denot = odenot.copySymDenotation(
           symbol = copy,
           owner = ttmap1.mapOwner(odenot.owner),
-          initFlags = odenot.flags &~ Touched,
+          initFlags = odenot.flags &~ Completing,
           info = completer,
           privateWithin = ttmap1.mapOwner(odenot.privateWithin), // since this refers to outer symbols, need not include copies (from->to) in ownermap here.
           annotations = odenot.annotations)

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

@@ -546,7 +546,7 @@ class TreeUnpickler(reader: TastyReader,
             rootd.symbol.coord = coord
             rootd.info = adjustIfModule(
                 new Completer(subReader(start, end)) with SymbolLoaders.SecondCompleter)
-            rootd.flags = flags &~ Touched // allow one more completion
+            rootd.flags = flags &~ Completing // allow one more completion
             rootd.setPrivateWithin(privateWithin)
             seenRoots += rootd.symbol
             rootd.finishedLoading()

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

@@ -486,7 +486,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
 
     def completeRoot(denot: ClassDenotation, completer: LazyType, privateWithin: Symbol): Symbol = {
       denot.setFlag(flags)
-      denot.resetFlag(Touched) // allow one more completion
+      denot.resetFlag(Completing) // allow one more completion
 
       // Temporary measure, as long as we do not read these classes from Tasty.
       // Scala-2 classes don't have NoInits set even if they are pure. We override this

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

@@ -179,8 +179,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
     // need to bring containers to start of method
     val (holders, stats) =
       trees.partition {
-        _.symbol.flags.&~(Touched) == containerFlags
-        // Filtering out Touched is not required currently, as there are no LazyTypes involved here
+        _.symbol.flags.&~(Completing) == containerFlags
+        // Filtering out Completing is not required currently, as there are no LazyTypes involved here
         // but just to be more safe
       }
     holders:::stats