Update comments

noti0na1 · noti0na1 · commit aa39739e4870 · 2022-02-02T03:45:06.000-05:00
diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala
@@ -1287,7 +1287,7 @@ object desugar {
     val ts = tree.trees
     val arity = ts.length
     assert(arity <= Definitions.MaxTupleArity)
-    def tupleTypeRef = defn.TupleType(arity)
+    def tupleTypeRef = defn.TupleType(arity).nn
     if (arity == 0)
       if (ctx.mode is Mode.Type) TypeTree(defn.UnitType) else unitLiteral
     else if (ctx.mode is Mode.Type) AppliedTypeTree(ref(tupleTypeRef), ts)
diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -1468,7 +1468,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def tupleTypeTree(elems: List[Tree])(using Context): Tree = {
     val arity = elems.length
     if arity <= Definitions.MaxTupleArity then
-      val tupleTp: TypeRef | Null = defn.TupleType(arity)
+      val tupleTp = defn.TupleType(arity)
       if tupleTp != null then
         AppliedTypeTree(TypeTree(tupleTp), elems)
       else nestedPairsTypeTree(elems)
diff --git a/compiler/src/dotty/tools/dotc/core/Annotations.scala b/compiler/src/dotty/tools/dotc/core/Annotations.scala
@@ -164,7 +164,7 @@ object Annotations {
   object LazyBodyAnnotation {
     def apply(bodyFn: Context ?=> Tree): LazyBodyAnnotation =
       new LazyBodyAnnotation:
-        protected var myTree: Tree | (Context ?=> Tree) = ctx ?=> bodyFn(using ctx)
+        protected var myTree: Tree | (Context ?=> Tree) | Null = ctx ?=> bodyFn(using ctx)
   }
 
   object Annotation {
@@ -195,15 +195,15 @@ object Annotations {
     /** Create an annotation where the tree is computed lazily. */
     def deferred(sym: Symbol)(treeFn: Context ?=> Tree)(using Context): Annotation =
       new LazyAnnotation {
-        protected var myTree: Tree | (Context ?=> Tree) = ctx ?=> treeFn(using ctx)
-        protected var mySym: Symbol | (Context ?=> Symbol) = sym
+        protected var myTree: Tree | (Context ?=> Tree) | Null = ctx ?=> treeFn(using ctx)
+        protected var mySym: Symbol | (Context ?=> Symbol) | Null = sym
       }
 
     /** Create an annotation where the symbol and the tree are computed lazily. */
     def deferredSymAndTree(symFn: Context ?=> Symbol)(treeFn: Context ?=> Tree)(using Context): Annotation =
       new LazyAnnotation {
-        protected var mySym: Symbol | (Context ?=> Symbol) = ctx ?=> symFn(using ctx)
-        protected var myTree: Tree | (Context ?=> Tree) = ctx ?=> treeFn(using ctx)
+        protected var mySym: Symbol | (Context ?=> Symbol) | Null = ctx ?=> symFn(using ctx)
+        protected var myTree: Tree | (Context ?=> Tree) | Null = ctx ?=> treeFn(using ctx)
       }
 
     /** Extractor for child annotations */
diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala
@@ -604,7 +604,7 @@ trait ConstraintHandling {
     val e = constraint.entry(param)
     if (e.exists) e.bounds
     else {
-      // TODO
+      // TODO: should we change the type of paramInfos to nullable?
       val pinfos: List[param.binder.PInfo] | Null = param.binder.paramInfos
       if (pinfos != null) pinfos(param.paramNum) // pinfos == null happens in pos/i536.scala
       else TypeBounds.empty
@@ -679,7 +679,6 @@ trait ConstraintHandling {
           if (!fromBelow) variance = -1
           def apply(t: Type): Type = t match {
             case t @ TypeParamRef(tl: TypeLambda, n) if comparedTypeLambdas contains tl =>
-              // TODO: do we need to check null here?
               val bounds = tl.paramInfos(n)
               range(bounds.lo, bounds.hi)
             case _ =>
diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala
@@ -271,14 +271,14 @@ object Contexts {
     /** Either the current scope, or, if the current context owner is a class,
      *  the declarations of the current class.
      */
+    // TODO: Should we change its type to nullable?
+    // We can see its value can be null in nestingLevel below.
     def effectiveScope(using Context): Scope =
-      // TODO
       val co: Symbol | Null = owner
       if co != null && co.isClass then co.asClass.unforcedDecls
       else scope
 
     def nestingLevel: Int =
-      // TODO
       val sc: Scope | Null = effectiveScope
       if sc != null then sc.nestingLevel else 0
 
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -180,8 +180,8 @@ class Definitions {
   private def enterT1ParameterlessMethod(cls: ClassSymbol, name: TermName, resultTypeFn: PolyType => Type, flags: FlagSet) =
     enterPolyMethod(cls, name, 1, resultTypeFn, flags)
 
-  private def mkArityArray(name: String, arity: Int, countFrom: Int): Array[TypeRef] = {
-    val arr = new Array[TypeRef](arity + 1)
+  private def mkArityArray(name: String, arity: Int, countFrom: Int): Array[TypeRef | Null] = {
+    val arr = new Array[TypeRef | Null](arity + 1)
     for (i <- countFrom to arity) arr(i) = requiredClassRef(name + i)
     arr
   }
@@ -1260,7 +1260,7 @@ class Definitions {
 
   @tu lazy val untestableClasses: Set[Symbol] = Set(NothingClass, NullClass, SingletonClass)
 
-  @tu lazy val AbstractFunctionType: Array[TypeRef] = mkArityArray("scala.runtime.AbstractFunction", MaxImplementedFunctionArity, 0)
+  @tu lazy val AbstractFunctionType: Array[TypeRef] = mkArityArray("scala.runtime.AbstractFunction", MaxImplementedFunctionArity, 0).asInstanceOf[Array[TypeRef]]
   val AbstractFunctionClassPerRun: PerRun[Array[Symbol]] = new PerRun(AbstractFunctionType.map(_.symbol.asClass))
   def AbstractFunctionClass(n: Int)(using Context): Symbol = AbstractFunctionClassPerRun()(using ctx)(n)
 
@@ -1283,7 +1283,7 @@ class Definitions {
     .withDefaultValue(holderImpl("LazyRef"))
   })
 
-  @tu lazy val TupleType: Array[TypeRef] = mkArityArray("scala.Tuple", MaxTupleArity, 1)
+  @tu lazy val TupleType: Array[TypeRef | Null] = mkArityArray("scala.Tuple", MaxTupleArity, 1)
 
   private class FunType(prefix: String):
     private var classRefs: Array[TypeRef | Null] = new Array(22)
@@ -1497,15 +1497,15 @@ class Definitions {
   def isTupleNType(tp: Type)(using Context): Boolean = {
     val arity = tp.dealias.argInfos.length
     arity <= MaxTupleArity && {
-      val tupletp: TypeRef | Null = TupleType(arity)
+      val tupletp = TupleType(arity)
       tupletp != null && tp.isRef(tupletp.symbol)
     }
   }
 
   def tupleType(elems: List[Type]): Type = {
     val arity = elems.length
     if 0 < arity && arity <= MaxTupleArity then
-      val tupletp: TypeRef | Null = TupleType(arity)
+      val tupletp = TupleType(arity)
       if tupletp != null then tupletp.appliedTo(elems)
       else TypeOps.nestedPairs(elems)
     else TypeOps.nestedPairs(elems)
diff --git a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala
@@ -132,7 +132,7 @@ object TypeErasure {
    */
   abstract case class ErasedValueType(tycon: TypeRef, erasedUnderlying: Type)
   extends CachedGroundType with ValueType {
-    override def computeHash(bs: Hashable.Binders): Int = doHash(bs, tycon, erasedUnderlying)
+    override def computeHash(bs: Hashable.Binders | Null): Int = doHash(bs, tycon, erasedUnderlying)
   }
 
   final class CachedErasedValueType(tycon: TypeRef, erasedUnderlying: Type)
@@ -690,7 +690,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst
   private def erasePair(tp: Type)(using Context): Type = {
     val arity = tp.tupleArity
     if (arity < 0) defn.ProductClass.typeRef
-    else if (arity <= Definitions.MaxTupleArity) defn.TupleType(arity)
+    else if (arity <= Definitions.MaxTupleArity) defn.TupleType(arity).nn
     else defn.TupleXXLClass.typeRef
   }
 
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -3919,7 +3919,6 @@ object Types {
         && {
           val bs1 = new BinderPairs(this, that, bs)
           // `paramInfos` and `resType` might still be uninstantiated at this point
-          // TODO:
           (paramInfos: List[TypeBounds] | Null) != null && (resType: Type | Null) != null &&
           paramInfos.equalElements(that.paramInfos, bs1) &&
           resType.equals(that.resType, bs1)
diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala
@@ -46,12 +46,8 @@ class PatternMatcher extends MiniPhase {
         case rt => tree.tpe
       val translated = new Translator(matchType, this).translateMatch(tree)
 
-      val engineCtx =
-        if tree.hasAttachment(Nullables.UnsafeNullsMatch)
-        then ctx.retractMode(Mode.SafeNulls) else ctx
-
       // check exhaustivity and unreachability
-      val engine = new patmat.SpaceEngine()(using engineCtx)
+      val engine = new patmat.SpaceEngine
       engine.checkExhaustivity(tree)
       engine.checkRedundancy(tree)
 
diff --git a/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala b/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala
@@ -195,7 +195,7 @@ class TupleOptimizations extends MiniPhase with IdentityDenotTransformer {
   private def knownTupleFromElements(tpes: List[Type], elements: List[Tree])(using Context) = {
     val size = elements.size
     assert(0 < size && size <= MaxTupleArity)
-    val tupleModule = defn.TupleType(size).classSymbol.companionModule
+    val tupleModule = defn.TupleType(size).nn.classSymbol.companionModule
     ref(tupleModule).select(nme.apply).appliedToTypes(tpes).appliedToTermArgs(elements)
   }
 
diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
@@ -274,7 +274,7 @@ object Implicits:
    *  @param companionRefs   the companion objects in the implicit scope.
    */
   class OfTypeImplicits(tp: Type, override val companionRefs: TermRefSet)(initctx: Context) extends ImplicitRefs(initctx) {
-    // TODO: do we need this assert?
+    // TODO: why do we need this assert?
     assert((initctx.typer: Typer | Null) != null)
     implicits.println(i"implicit scope of type $tp = ${companionRefs.showAsList}%, %")
     @threadUnsafe lazy val refs: List[ImplicitRef] = {
@@ -1864,9 +1864,10 @@ sealed class TermRefSet(using Context):
     if !that.isEmpty then that.foreach(+=)
 
   def foreach[U](f: TermRef => U): Unit =
-    // TODO: do we need to check sym == null?
     def handle(sym: TermSymbol | Null, prefixes: Type | List[Type] | Null): Unit =
-      prefixes match
+      // We cannot use `.nn` here due to inference issue.
+      val prefixes0: Type | List[Type] = prefixes.uncheckedNN
+      prefixes0 match
         case prefix: Type => f(TermRef(prefix, sym.uncheckedNN))
         case prefixes: List[Type] => prefixes.foreach(pre => f(TermRef(pre, sym.uncheckedNN)))
     elems.forEach(handle)
diff --git a/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala b/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala
@@ -224,7 +224,7 @@ class ImportInfo(symf: Context ?=> Symbol,
           case None =>
             var c = ctx.outer
             while c.importInfo eq ctx.importInfo do c = c.outer
-            // TODO
+            // TODO: Do we need to change importInfo to nullable?
             ((c.importInfo: ImportInfo | Null) != null) && c.importInfo.featureImported(feature)(using c)
       )
     featureCache(feature).nn
diff --git a/compiler/src/dotty/tools/dotc/typer/Nullables.scala b/compiler/src/dotty/tools/dotc/typer/Nullables.scala
@@ -22,13 +22,6 @@ import ast.Trees.mods
 object Nullables:
   import ast.tpd._
 
-  /** An attachment that represents a match tree is created under Unsafe Nulls.
-   *  This is used to pass Unsafe Nulls information to PatternMatcher Phase,
-   *  so we don't get Match case Unreachable Warning when using `case null => ???`
-   *  on non-nullable type.
-   */
-  val UnsafeNullsMatch = Property.StickyKey[Unit]
-
   inline def unsafeNullsEnabled(using Context): Boolean =
     ctx.explicitNulls && !ctx.mode.is(Mode.SafeNulls)
 
diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -137,7 +137,7 @@ object ProtoTypes {
     override def deepenProto(using Context): Type = ignored
     override def deepenProtoTrans(using Context): Type = ignored.deepenProtoTrans
 
-    override def computeHash(bs: Hashable.Binders): Int = doHash(bs, ignored)
+    override def computeHash(bs: Hashable.Binders | Null): Int = doHash(bs, ignored)
 
     override def eql(that: Type): Boolean = that match
       case that: IgnoredProto => ignored eq that.ignored
@@ -221,7 +221,7 @@ object ProtoTypes {
     override def deepenProtoTrans(using Context): SelectionProto =
       derivedSelectionProto(name, memberProto.deepenProtoTrans, compat)
 
-    override def computeHash(bs: Hashable.Binders): Int = {
+    override def computeHash(bs: Hashable.Binders | Null): Int = {
       val delta = (if (compat eq NoViewsAllowed) 1 else 0) | (if (privateOK) 2 else 0)
       addDelta(doHash(bs, name, memberProto), delta)
     }
@@ -585,7 +585,7 @@ object ProtoTypes {
   }
 
   class CachedViewProto(argType: Type, resultType: Type) extends ViewProto(argType, resultType) {
-    override def computeHash(bs: Hashable.Binders): Int = doHash(bs, argType, resultType)
+    override def computeHash(bs: Hashable.Binders | Null): Int = doHash(bs, argType, resultType)
     override def eql(that: Type): Boolean = that match
       case that: ViewProto => (argType eq that.argType) && (resType eq that.resType)
       case _ => false
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -328,6 +328,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
         (prevPrec.ordinal < prec.ordinal || prevPrec == prec && (prevCtx.scope eq ctx.scope))
 
       @tailrec def loop(lastCtx: Context)(using Context): Type =
+        // Can ctx.scope actually be null?
         if ((ctx.scope: Scope | Null) == null) previous
         else {
           var result: Type = NoType
@@ -1501,7 +1502,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
   }
 
   def typedMatch(tree: untpd.Match, pt: Type)(using Context): Tree =
-    val tree1 = tree.selector match {
+    tree.selector match {
       case EmptyTree =>
         if (tree.isInline) {
           checkInInlineContext("summonFrom", tree.srcPos)
@@ -1603,9 +1604,6 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
             result
         }
     }
-    if Nullables.unsafeNullsEnabled && ctx.phase == Phases.typerPhase then
-      tree1.putAttachment(Nullables.UnsafeNullsMatch, ())
-    tree1
 
   /** Special typing of Match tree when the expected type is a MatchType,
    *  and the patterns of the Match tree and the MatchType correspond.
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -2702,7 +2702,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       def FunctionClass(arity: Int, isImplicit: Boolean = false, isErased: Boolean = false): Symbol =
         dotc.core.Symbols.defn.FunctionClass(arity, isImplicit, isErased)
       def TupleClass(arity: Int): Symbol =
-        dotc.core.Symbols.defn.TupleType(arity).classSymbol.asClass
+        dotc.core.Symbols.defn.TupleType(arity).nn.classSymbol.asClass
       def isTupleClass(sym: Symbol): Boolean =
         dotc.core.Symbols.defn.isTupleClass(sym)
       def ScalaPrimitiveValueClasses: List[Symbol] =

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ class TupleOptimizations extends MiniPhase with IdentityDenotTransformer {`
`195`	`195`	`private def knownTupleFromElements(tpes: List[Type], elements: List[Tree])(using Context) = {`
`196`	`196`	`val size = elements.size`
`197`	`197`	`assert(0 < size && size <= MaxTupleArity)`
`198`		`- val tupleModule = defn.TupleType(size).classSymbol.companionModule`
	`198`	`+ val tupleModule = defn.TupleType(size).nn.classSymbol.companionModule`
`199`	`199`	`ref(tupleModule).select(nme.apply).appliedToTypes(tpes).appliedToTermArgs(elements)`
`200`	`200`	`}`
`201`	`201`