Merge pull request #46 from noti0na1/dotty-explicit-nulls-only

Disallow comparison between Object and Null

Author: noti0na1

.gitignore

@@ -83,3 +83,37 @@ community-build/sbt-dotty-sbt
 
 # Vulpix output files
 *.check.out
+
+tastydoc/report/report\.aux
+
+tastydoc/report/report\.fdb_latexmk
+
+tastydoc/report/report\.fls
+
+tastydoc/report/report\.synctex\.gz
+
+tastydoc/report/report\.toc
+
+tastydoc/report/report\.out
+
+tastydoc/report/presentation/presentation\.aux
+
+tastydoc/report/presentation/presentation\.fdb_latexmk
+
+tastydoc/report/presentation/presentation\.fls
+
+tastydoc/report/presentation/presentation\.nav
+
+tastydoc/report/presentation/presentation\.out
+
+tastydoc/report/presentation/presentation\.snm
+
+tastydoc/report/presentation/presentation\.synctex\.gz
+
+tastydoc/report/presentation/presentation\.toc
+
+tastydoc/dotty-0\.15\.0-RC1/
+
+tastydoc/report/presentation/presentation\.vrb
+
+tastydoc/dotty-0\.16\.0-RC3/

build.sbt

@@ -14,6 +14,11 @@ val `dotty-staging` = Build.`dotty-staging`
 val `dotty-language-server` = Build.`dotty-language-server`
 val `dotty-bench` = Build.`dotty-bench`
 val `dotty-bench-bootstrapped` = Build.`dotty-bench-bootstrapped`
+val `tasty-core` = Build.`tasty-core`
+val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
+val `tasty-core-scala2` = Build.`tasty-core-scala2`
+val `dotty-tastydoc` = Build.`dotty-tastydoc`
+val `dotty-tastydoc-input` = Build.`dotty-tastydoc-input`
 val `scala-library` = Build.`scala-library`
 val `scala-compiler` = Build.`scala-compiler`
 val `scala-reflect` = Build.`scala-reflect`

community-build/community-projects/sourcecode

@@ -160,7 +160,7 @@ object projects
 
   lazy val scalatestplusScalacheck = SbtCommunityProject(
     project = "scalatestplus-scalacheck",
-    sbtTestCommand = "scalatestPlusScalaCheckJVM/compile",  // TODO: compile only because tests are prone to java.lang.OutOfMemoryError: Metaspace
+    sbtTestCommand = "scalatestPlusScalaCheckJVM/test",
     sbtUpdateCommand = "scalatestPlusScalaCheckJVM/update",
     sbtPublishCommand = "scalatestPlusScalaCheckJVM/publishLocal",
     dependencies = List(scalatest, scalacheck)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -20,13 +20,13 @@ import Decorators._
 
 import java.io.DataOutputStream
 
+import dotty.tools.tasty.{ TastyBuffer, TastyHeaderUnpickler }
 
 import scala.tools.asm
 import scala.tools.asm.Handle
 import scala.tools.asm.tree._
 import tpd._
 import StdNames._
-import dotty.tools.dotc.core.tasty.{TastyBuffer, TastyHeaderUnpickler}
 import dotty.tools.io._
 
 class GenBCode extends Phase {

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -1,7 +1,7 @@
 package dotty.tools
 package dotc
 
-import util.SourceFile
+import util.{FreshNameCreator, SourceFile}
 import ast.{tpd, untpd}
 import tpd.{Tree, TreeTraverser}
 import typer.PrepareInlineable.InlineAccessors
@@ -27,6 +27,12 @@ class CompilationUnit protected (val source: SourceFile) {
   /** Pickled TASTY binaries, indexed by class. */
   var pickled: Map[ClassSymbol, Array[Byte]] = Map()
 
+  /** The fresh name creator for the current unit.
+   *  FIXME(#7661): This is not fine-grained enough to enable reproducible builds,
+   *  see https://github.com/scala/scala/commit/f50ec3c866263448d803139e119b33afb04ec2bc
+   */
+  val freshNames: FreshNameCreator = new FreshNameCreator.Default
+
   /** Will be set to `true` if contains `Quote`.
    *  The information is used in phase `Staging` in order to avoid traversing trees that need no transformations.
    */

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

@@ -52,7 +52,6 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       .setTyper(new Typer)
       .addMode(Mode.ImplicitsEnabled)
       .setTyperState(new TyperState(ctx.typerState))
-      .setFreshNames(new FreshNameCreator.Default)
     ctx.initialize()(start) // re-initialize the base context with start
     def addImport(ctx: Context, rootRef: ImportInfo.RootRef) =
       ctx.fresh.setImportInfo(ImportInfo.rootImport(rootRef)(ctx))
@@ -241,12 +240,15 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
     }
   }
 
-  def compileFromString(sourceCode: String): Unit = {
-    val virtualFile = new VirtualFile("compileFromString-${java.util.UUID.randomUUID().toString}")
-    val writer = new BufferedWriter(new OutputStreamWriter(virtualFile.output, "UTF-8")) // buffering is still advised by javadoc
-    writer.write(sourceCode)
-    writer.close()
-    compileSources(List(new SourceFile(virtualFile, Codec.UTF8)))
+  def compileFromStrings(sourceCodes: String*): Unit = {
+    val sourceFiles = sourceCodes.map {sourceCode =>
+      val virtualFile = new VirtualFile("compileFromString-${java.util.UUID.randomUUID().toString}")
+      val writer = new BufferedWriter(new OutputStreamWriter(virtualFile.output, "UTF-8")) // buffering is still advised by javadoc
+      writer.write(sourceCode)
+      writer.close()
+      new SourceFile(virtualFile, Codec.UTF8)
+    }
+    compileSources(sourceFiles.toList)
   }
 
   /** Print summary; return # of errors encountered */

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

@@ -121,7 +121,7 @@ object Comments {
         val tree = new Parser(SourceFile.virtual("<usecase>", code)).localDef(codePos.start)
         tree match {
           case tree: untpd.DefDef =>
-            val newName = ctx.freshNames.newName(tree.name, NameKinds.DocArtifactName)
+            val newName = ctx.compilationUnit.freshNames.newName(tree.name, NameKinds.DocArtifactName)
             untpd.cpy.DefDef(tree)(name = newName)
           case _ =>
             ctx.error(ProperDefinitionNotFound(), ctx.source.atSpan(codePos))

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

@@ -14,7 +14,7 @@ import Uniques._
 import ast.Trees._
 import ast.untpd
 import Flags.GivenOrImplicit
-import util.{FreshNameCreator, NoSource, SimpleIdentityMap, SourceFile}
+import util.{NoSource, SimpleIdentityMap, SourceFile}
 import typer.{Implicits, ImportInfo, Inliner, NamerContextOps, SearchHistory, SearchRoot, TypeAssigner, Typer, Nullables}
 import Nullables.{NotNullInfo, given}
 import Implicits.ContextualImplicits
@@ -44,12 +44,11 @@ object Contexts {
   private val (sbtCallbackLoc,      store2) = store1.newLocation[AnalysisCallback]()
   private val (printerFnLoc,        store3) = store2.newLocation[Context => Printer](new RefinedPrinter(_))
   private val (settingsStateLoc,    store4) = store3.newLocation[SettingsState]()
-  private val (freshNamesLoc,       store5) = store4.newLocation[FreshNameCreator](new FreshNameCreator.Default)
-  private val (compilationUnitLoc,  store6) = store5.newLocation[CompilationUnit]()
-  private val (runLoc,              store7) = store6.newLocation[Run]()
-  private val (profilerLoc,         store8) = store7.newLocation[Profiler]()
-  private val (notNullInfosLoc,     store9) = store8.newLocation[List[NotNullInfo]]()
-  private val initialStore = store9
+  private val (compilationUnitLoc,  store5) = store4.newLocation[CompilationUnit]()
+  private val (runLoc,              store6) = store5.newLocation[Run]()
+  private val (profilerLoc,         store7) = store6.newLocation[Profiler]()
+  private val (notNullInfosLoc,     store8) = store7.newLocation[List[NotNullInfo]]()
+  private val initialStore = store8
 
   /** The current context */
   def curCtx(given ctx: Context): Context = ctx
@@ -200,9 +199,6 @@ object Contexts {
     /** The current settings values */
     def settingsState: SettingsState = store(settingsStateLoc)
 
-    /** The current fresh name creator */
-    def freshNames: FreshNameCreator = store(freshNamesLoc)
-
     /** The current compilation unit */
     def compilationUnit: CompilationUnit = store(compilationUnitLoc)
 
@@ -474,6 +470,8 @@ object Contexts {
         if (prev != null) prev
         else {
           val newCtx = fresh.setSource(source)
+          if (newCtx.compilationUnit == null)
+            newCtx.setCompilationUnit(CompilationUnit(source))
           sourceCtx = sourceCtx.updated(source, newCtx)
           newCtx
         }
@@ -566,7 +564,6 @@ object Contexts {
     def setSettings(settingsState: SettingsState): this.type = updateStore(settingsStateLoc, settingsState)
     def setRun(run: Run): this.type = updateStore(runLoc, run)
     def setProfiler(profiler: Profiler): this.type = updateStore(profilerLoc, profiler)
-    def setFreshNames(freshNames: FreshNameCreator): this.type = updateStore(freshNamesLoc, freshNames)
     def setNotNullInfos(notNullInfos: List[NotNullInfo]): this.type = updateStore(notNullInfosLoc, notNullInfos)
 
     def setProperty[T](key: Key[T], value: T): this.type =

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

@@ -52,12 +52,12 @@ object JavaNullInterop {
    *
    *  But the selection can throw an NPE if the returned value is `null`.
    */
-  def nullifyMember(sym: Symbol, tp: Type, isEnum: Boolean)(implicit ctx: Context): Type = {
+  def nullifyMember(sym: Symbol, tp: Type, isEnumValueDef: Boolean)(implicit ctx: Context): Type = {
     assert(ctx.explicitNulls)
     assert(sym.is(JavaDefined), "can only nullify java-defined members")
 
     // Some special cases when nullifying the type
-    if (isEnum || sym.name == nme.TYPE_)
+    if (isEnumValueDef || sym.name == nme.TYPE_)
       // Don't nullify the `TYPE` field in every class and Java enum instances
       tp
     else if (sym.name == nme.toString_ || sym.isConstructor || hasNotNullAnnot(sym))

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

@@ -215,7 +215,7 @@ object NameKinds {
 
     /** Generate fresh unique term name of this kind with given prefix name */
     def fresh(prefix: TermName = EmptyTermName)(implicit ctx: Context): TermName =
-      ctx.freshNames.newName(prefix, this)
+      ctx.compilationUnit.freshNames.newName(prefix, this)
 
     /** Generate fresh unique type name of this kind with given prefix name */
     def fresh(prefix: TypeName)(implicit ctx: Context): TypeName =

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

@@ -1,8 +1,6 @@
-package dotty.tools
-package dotc
-package core
+package dotty.tools.dotc.core
 
-import tasty.TastyFormat
+import dotty.tools.tasty.TastyFormat
 
 /** The possible tags of a NameKind */
 object NameTags extends TastyFormat.NameTags {

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

@@ -624,6 +624,7 @@ object Types {
       }
       def goRec(tp: RecType) =
         if (tp.parent == null) NoDenotation
+        else if (tp eq pre) go(tp.parent)
         else {
           //println(s"find member $pre . $name in $tp")
 

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

@@ -3,10 +3,11 @@ package dotc
 package core
 package classfile
 
+import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler }
+
 import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._
 import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._
 import NameKinds.DefaultGetterName
-import dotty.tools.dotc.core.tasty.{TastyHeaderUnpickler, TastyReader}
 import ast.tpd._
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, IOException }
 
@@ -1185,4 +1186,3 @@ class ClassfileParser(
       throw new RuntimeException("bad constant pool tag " + in.buf(start) + " at byte " + start)
   }
 }
-

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

@@ -12,11 +12,13 @@ import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.core.tasty.TreePickler.Hole
-import dotty.tools.dotc.core.tasty.{PositionPickler, TastyPickler, TastyPrinter, TastyString}
+import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter }
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 import dotty.tools.dotc.quoted.QuoteContext
 import dotty.tools.dotc.tastyreflect.ReflectionImpl
 
+import dotty.tools.tasty.TastyString
+
 import scala.internal.quoted._
 import scala.reflect.ClassTag
 

compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala

@@ -4,6 +4,8 @@ import dotty.tools.dotc.core.tasty._
 import dotty.tools.dotc.core.tasty.TastyUnpickler.NameTable
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 
+import dotty.tools.tasty.TastyReader
+
 object QuoteUnpickler {
   class QuotedTreeSectionUnpickler(posUnpickler: Option[PositionUnpickler], splices: Seq[Any])
     extends DottyUnpickler.TreeSectionUnpickler(posUnpickler, None) {

compiler/src/dotty/tools/dotc/core/quoted/QuoteUnpickler.scala

@@ -3,7 +3,9 @@ package dotty.tools.dotc.core.tasty
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Comments.{Comment, CommentsContext, ContextDocstrings}
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.tasty.TastyBuffer.{Addr, NoAddr}
+
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer.{Addr, NoAddr}
 
 import java.nio.charset.Charset
 
@@ -40,4 +42,3 @@ class CommentPickler(pickler: TastyPickler, addrOfTree: tpd.Tree => Addr)(implic
       }
   }
 }
-

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

@@ -1,9 +1,11 @@
 package dotty.tools.dotc.core.tasty
 
 import dotty.tools.dotc.core.Comments.Comment
-import dotty.tools.dotc.core.tasty.TastyBuffer.Addr
 import dotty.tools.dotc.util.Spans.Span
 
+import dotty.tools.tasty.{TastyReader, TastyBuffer}
+import TastyBuffer.Addr
+
 import scala.collection.mutable.HashMap
 
 import java.nio.charset.Charset
@@ -29,4 +31,3 @@ class CommentUnpickler(reader: TastyReader) {
   def commentAt(addr: Addr): Option[Comment] =
     comments.get(addr)
 }
-

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

@@ -10,6 +10,8 @@ import classfile.ClassfileParser
 import Names.SimpleName
 import TreeUnpickler.UnpickleMode
 
+import dotty.tools.tasty.TastyReader
+
 object DottyUnpickler {
 
   /** Exception thrown if classfile is corrupted */

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

@@ -3,11 +3,13 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer._
+
 import collection.mutable
 import Names.{Name, chrs, SimpleName, DerivedName, TypeName}
 import NameKinds._
 import Decorators._
-import TastyBuffer._
 import scala.io.Codec
 
 class NameBuffer extends TastyBuffer(10000) {

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

@@ -3,16 +3,18 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyFormat.SOURCE
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer._
+
 import ast._
 import ast.Trees._
 import ast.Trees.WithLazyField
 import util.{SourceFile, NoSource}
 import core._
 import Contexts._, Symbols._, Annotations._, Decorators._
 import collection.mutable
-import TastyBuffer._
 import util.Spans._
-import TastyFormat.SOURCE
 
 class PositionPickler(pickler: TastyPickler, addrOfTree: untpd.Tree => Addr) {
   val buf: TastyBuffer = new TastyBuffer(5000)

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

@@ -3,10 +3,12 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{TastyFormat, TastyBuffer, TastyReader}
+import TastyFormat.SOURCE
+import TastyBuffer.{Addr, NameRef}
+
 import util.Spans._
 import collection.{mutable, Map}
-import TastyBuffer.{Addr, NameRef}
-import TastyFormat.SOURCE
 import Names.TermName
 
 /** Unpickler for tree positions */
@@ -61,4 +63,3 @@ class PositionUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName) {
   def spanAt(addr: Addr): Span = spans.getOrElse(addr, NoSpan)
   def sourcePathAt(addr: Addr): String = sourcePaths.getOrElse(addr, "")
 }
-

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

@@ -2,11 +2,13 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{TastyBuffer, TastyReader}
+import TastyBuffer.NameRef
+
 import Contexts._, Decorators._
 import Names.{Name, TermName}
 import StdNames.nme
 import TastyUnpickler._
-import TastyBuffer.NameRef
 import util.Spans.offsetToInt
 import printing.Highlighting._
 
@@ -20,7 +22,7 @@ class TastyClassName(bytes: Array[Byte]) {
   def readName(): Option[(TermName, TermName)] = unpickle(new TreeSectionUnpickler)
 
   class TreeSectionUnpickler extends SectionUnpickler[(TermName, TermName)](TreePickler.sectionName) {
-    import TastyFormat._
+    import dotty.tools.tasty.TastyFormat._
     def unpickle(reader: TastyReader, tastyName: NameTable): (TermName, TermName) = {
       import reader._
       def readName() = {