Merge remote-tracking branch 'upstream/master' into dotty-explicit-nulls-only

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

@@ -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 =