Merge branch '2.13.x' into issue/11839

Author: steven-barnes

build.sbt

@@ -89,6 +89,8 @@ Global / mimaReferenceVersion := Some("2.13.0")
 import com.typesafe.tools.mima.core._
 val mimaFilterSettings = Seq {
   mimaBinaryIssueFilters ++= Seq(
+    ProblemFilters.exclude[IncompatibleSignatureProblem]("*"),
+    ProblemFilters.exclude[InaccessibleMethodProblem]("java.lang.Object.<clinit>"),
     ProblemFilters.exclude[Problem]("scala.reflect.internal.*"),
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.reflect.runtime.JavaMirrors#JavaMirror.typeTag"),
     ProblemFilters.exclude[MissingClassProblem]("scala.reflect.runtime.JavaMirrors$JavaMirror$typeTagCache$"),
@@ -193,7 +195,7 @@ lazy val instanceSettings = Seq[Setting[_]](
     // We create a managed copy to prevent sbt from putting it on the classpath where we don't want it
     if(s.isManagedVersion) s else {
       import sbt.internal.inc.ScalaInstance
-      val s2 = new ScalaInstance(s.version, s.loader, s.loaderLibraryOnly, s.libraryJar, s.compilerJar, s.allJars, Some(s.actualVersion))
+      val s2 = new ScalaInstance(s.version, s.loader, s.loaderLibraryOnly, s.libraryJars, s.compilerJar, s.allJars, Some(s.actualVersion))
       assert(s2.isManagedVersion)
       s2
     }

project/DottySupport.scala

@@ -2,6 +2,7 @@ package scala.build
 
 import sbt._
 import sbt.Keys._
+import java.io.File
 
 import sbt.librarymanagement.{
   ivy, DependencyResolution, ScalaModuleInfo, UpdateConfiguration, UnresolvedWarningConfiguration
@@ -25,6 +26,19 @@ object DottySupport {
     // Needed to compile dotty-library together with scala-library
     compileOrder := CompileOrder.Mixed,
 
+    // Add the dotty-library sources to the sourcepath
+    scalacOptions in Compile := {
+      val old = (scalacOptions in Compile).value
+
+      val (beforeSourcepath, "-sourcepath" :: oldSourcepath :: afterSourcePath) = old.span(_ != "-sourcepath")
+
+      val newSourcepath =
+        ((sourceManaged in Compile).value / "dotty-library-src").getAbsolutePath +
+        File.pathSeparator + oldSourcepath
+
+      beforeSourcepath ++ ("-sourcepath" :: newSourcepath :: afterSourcePath)
+    },
+
     // Some files shouldn't be compiled
     excludeFilter in unmanagedSources ~= (old =>
       old ||
@@ -41,14 +55,7 @@ object DottySupport {
           val name = file.name
           val path = file.getCanonicalPath
           file.isFile &&
-          (path.endsWith(".scala") || path.endsWith(".java")) &&
-          !file.getCanonicalPath.contains("src-non-bootstrapped") &&
-          // Copies of files already present in the scala-library present until
-          // Dotty switches to 2.13.
-          !path.endsWith("scala/runtime/ModuleSerializationProxy.java") &&
-          !path.endsWith("scala/ValueOf.scala") &&
-          // Corresponding files have been copied in this repo
-          !path.contains("scalaShadowing")
+          (path.endsWith(".scala") || path.endsWith(".java"))
         }
       }
 

project/SavedLogs.scala

@@ -27,7 +27,7 @@ object SavedLogs {
 
   def clearSavedLogsImpl(): Unit = synchronized { savedLogs.clear() }
 
-  class MyAppender(val name: String) extends AbstractAppender(name, null, null, true) {
+  class MyAppender(val name: String) extends AbstractAppender(name, null, null, true, Array()) {
     start()
     val buf = new mutable.ArrayBuffer[StringEvent]
     override def append(logEvent: core.LogEvent): Unit = {

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.7

project/plugins.sbt

@@ -17,7 +17,7 @@ buildInfoKeys := Seq[BuildInfoKey](buildClasspath)
 
 buildInfoPackage := "scalabuild"
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
 
 libraryDependencies ++= Seq(
   "org.eclipse.jgit" % "org.eclipse.jgit" % "4.6.0.201612231935-r",
@@ -31,13 +31,11 @@ concurrentRestrictions in Global := Seq(
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
 
-scalaVersion := "2.12.7"
-
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")
 
 // See DottySupport.scala
 if (Option(System.getProperty("scala.build.compileWithDotty")).map(_.toBoolean).getOrElse(false))
-  Seq(addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.3"))
+  Seq(addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.4"))
 else
   Seq()
 

scripts/common

@@ -11,7 +11,7 @@ else
 fi
 
 SBT_CMD=${SBT_CMD-sbt}
-SBT_CMD="$SBT_CMD -sbt-version 1.2.8"
+SBT_CMD="$SBT_CMD -sbt-version 1.3.7"
 
 # repo to publish builds
 integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}

src/compiler/scala/tools/nsc/PhaseAssembly.scala

@@ -13,7 +13,6 @@
 package scala.tools.nsc
 
 import scala.collection.mutable
-import scala.language.postfixOps
 
 /** Converts an unordered morass of components into an order that
  *  satisfies their mutual constraints.
@@ -104,7 +103,7 @@ trait PhaseAssembly {
     /* Test if there are cycles in the graph, assign levels to the nodes
      * and collapse hard links into nodes
      */
-    def collapseHardLinksAndLevels(node: Node, lvl: Int) {
+    def collapseHardLinksAndLevels(node: Node, lvl: Int): Unit = {
       if (node.visited) {
         dump("phase-cycle")
         throw new FatalError(s"Cycle in phase dependencies detected at ${node.phasename}, created phase-cycle.dot")
@@ -288,7 +287,7 @@ trait PhaseAssembly {
    * file showing its structure.
    * Plug-in supplied phases are marked as green nodes and hard links are marked as blue edges.
    */
-  private def graphToDotFile(graph: DependencyGraph, filename: String) {
+  private def graphToDotFile(graph: DependencyGraph, filename: String): Unit = {
     val sbuf = new StringBuilder
     val extnodes = new mutable.HashSet[graph.Node]()
     val fatnodes = new mutable.HashSet[graph.Node]()

src/compiler/scala/tools/nsc/PipelineMain.scala

@@ -12,11 +12,9 @@
 
 package scala.tools.nsc
 
-import java.io.{BufferedOutputStream, File}
+import java.io.File
 import java.lang.Thread.UncaughtExceptionHandler
-import java.nio.file.attribute.FileTime
 import java.nio.file.{Files, Path, Paths}
-import java.time.Instant
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.{AtomicBoolean, AtomicInteger}
 import java.util.{Collections, Locale}
@@ -25,13 +23,13 @@ import javax.tools.Diagnostic.Kind
 import javax.tools.{Diagnostic, DiagnosticListener, JavaFileObject, ToolProvider}
 
 import scala.collection.{immutable, mutable}
+import scala.collection.immutable.ArraySeq.unsafeWrapArray
 import scala.concurrent._
 import scala.concurrent.duration.Duration
 import scala.jdk.CollectionConverters._
 import scala.math.Ordering.Double.TotalOrdering
-import scala.reflect.internal.pickling.PickleBuffer
 import scala.reflect.internal.util.{BatchSourceFile, FakePos, NoPosition, Position}
-import scala.reflect.io.{PlainNioFile, RootPath}
+import scala.reflect.io.PlainNioFile
 import scala.tools.nsc.PipelineMain.{OutlineTypePipeline, Pipeline, Traditional}
 import scala.tools.nsc.io.AbstractFile
 import scala.tools.nsc.reporters.{ConsoleReporter, Reporter}
@@ -111,7 +109,6 @@ class PipelineMainClass(argFiles: Seq[Path], pipelineSettings: PipelineMain.Pipe
     val projects: List[Task] = argFiles.toList.map(commandFor)
     if (reporter.hasErrors) return false
 
-    val numProjects = projects.size
     val produces = mutable.LinkedHashMap[Path, Task]()
     for (p <- projects) {
       produces(p.outputDir) = p
@@ -664,7 +661,7 @@ object PipelineMain {
       case Array(path) if Files.isDirectory(Paths.get(path)) =>
         Files.walk(Paths.get(path)).iterator().asScala.filter(_.getFileName.toString.endsWith(".args")).toList
       case _ =>
-        args.map(Paths.get(_))
+        unsafeWrapArray(args.map(Paths.get(_)))
     }
     val main = new PipelineMainClass(argFiles, defaultSettings)
     val result = main.process()

src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala

@@ -276,7 +276,7 @@ abstract class TreeBrowsers {
       val jmiGoto = new JMenuItem(
         new AbstractAction("Go to unit") {
           putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, menuKey, false))
-          override def actionPerformed(actionEvent: ActionEvent) {
+          override def actionPerformed(actionEvent: ActionEvent): Unit = {
             val query = JOptionPane.showInputDialog("Go to unit:", frame.getOwner)
             if (query ne null) { // "Cancel" returns null
               val units = treeModel.program.units

src/compiler/scala/tools/nsc/ast/parser/Scanners.scala

@@ -1094,10 +1094,10 @@ trait Scanners extends ScannersCommon {
         syntaxError("Invalid literal number")
     }
 
-    @inline private def isNumberSeparator(c: Char): Boolean = c == '_' //|| c == '\''
+    @inline private def isNumberSeparator(c: Char): Boolean = c == '_'
 
     @inline private def removeNumberSeparators(s: String): String =
-      if (s.indexOf('_') > 0) s.replaceAllLiterally("_", "") /*.replaceAll("'","")*/ else s
+      if (s.indexOf('_') > 0) s.replace("_", "") else s
 
     // disallow trailing numeric separator char, but let lexing limp along
     def checkNoTrailingSeparator(): Unit =

src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala

@@ -64,9 +64,9 @@ abstract class BCodeHelpers extends BCodeIdiomatic {
   def needsStaticImplMethod(sym: Symbol) = sym.hasAttachment[global.mixer.NeedStaticImpl.type]
 
   final def traitSuperAccessorName(sym: Symbol): String = {
-    val name = sym.javaSimpleName
-    if (sym.isMixinConstructor) name.toString
-    else name + nme.NAME_JOIN_STRING
+    val nameString = sym.javaSimpleName.toString
+    if (sym.isMixinConstructor) nameString
+    else nameString + nme.NAME_JOIN_STRING
   }
 
   /**

src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala

@@ -18,8 +18,8 @@ import java.lang.{StringBuilder, ThreadLocal}
 
 import scala.annotation.tailrec
 import scala.collection.SortedMap
-import scala.tools.asm
-import scala.tools.asm.Opcodes
+import scala.collection.immutable.ArraySeq.unsafeWrapArray
+import scala.tools.asm, asm.Opcodes
 import scala.tools.nsc.backend.jvm.BTypes.{InlineInfo, InternalName}
 import scala.tools.nsc.backend.jvm.BackendReporting._
 import scala.tools.nsc.backend.jvm.opt._
@@ -1145,7 +1145,7 @@ object BTypes {
         i += 1
       }
       scala.util.Sorting.quickSort(result)(Ordering.by(_._1))
-      result
+      unsafeWrapArray(result)
     }
   }
 

src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala

@@ -404,9 +404,9 @@ abstract class BTypesFromSymbols[G <: Global](val global: G) extends BTypes {
      * Here we get rid of the module class B, making sure that the class B is present.
      */
     def nestedClassSymbolsNoJavaModuleClasses = nestedClassSymbols.filter { s =>
-      val ok = !(s.isJavaDefined && s.isModuleClass) && !s.isPackage
+      val ok = !(s.isJavaDefined && s.isModuleClass) && !s.hasPackageFlag
       if (!ok)
-        if (!s.isPackage) {
+        if (!s.hasPackageFlag) {
           // We could also search in nestedClassSymbols for s.linkedClassOfClass, but sometimes that
           // returns NoSymbol, so it doesn't work.
           val nb = nestedClassSymbols.count(mc => mc.name == s.name && mc.owner == s.owner)

src/compiler/scala/tools/nsc/backend/jvm/GeneratedClassHandler.scala

@@ -14,7 +14,6 @@ package scala.tools.nsc
 package backend.jvm
 
 import java.nio.channels.ClosedByInterruptException
-import java.nio.file.Path
 import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy
 import java.util.concurrent._
 

src/compiler/scala/tools/nsc/backend/jvm/analysis/AliasingAnalyzer.scala

@@ -36,7 +36,7 @@ class AliasingFrame[V <: Value](nLocals: Int, nStack: Int) extends Frame[V](nLoc
   import Opcodes._
 
   // Auxiliary constructor required for implementing `AliasingAnalyzer.newFrame`
-  def this(src: Frame[_ <: V]) {
+  def this(src: Frame[_ <: V]) = {
     this(src.getLocals, src.getMaxStackSize)
     init(src)
   }

src/compiler/scala/tools/nsc/backend/jvm/analysis/NullnessAnalyzer.scala

@@ -152,7 +152,7 @@ class NullnessFrame(nLocals: Int, nStack: Int) extends AliasingFrame[NullnessVal
   private[this] var ifNullAliases: AliasSet = null
 
   // Auxiliary constructor required for implementing `NullnessAnalyzer.newFrame`
-  def this(src: Frame[_ <: NullnessValue]) {
+  def this(src: Frame[_ <: NullnessValue]) = {
     this(src.getLocals, src.getMaxStackSize)
     init(src)
   }

src/compiler/scala/tools/nsc/classpath/AggregateClassPath.scala

@@ -14,6 +14,7 @@ package scala.tools.nsc.classpath
 
 import java.net.URL
 
+import scala.collection.immutable.ArraySeq.unsafeWrapArray
 import scala.collection.mutable.ArrayBuffer
 import scala.reflect.internal.FatalError
 import scala.reflect.io.AbstractFile
@@ -102,7 +103,7 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
       }
     }
 
-    val distinctPackages: Seq[PackageEntry] = if (packages == null) Nil else packages.toArray(new Array[PackageEntry](packages.size()))
+    val distinctPackages: Seq[PackageEntry] = if (packages == null) Nil else unsafeWrapArray(packages.toArray(new Array[PackageEntry](packages.size())))
     val distinctClassesAndSources = mergeClassesAndSources(classesAndSourcesBuffer)
     ClassPathEntries(distinctPackages, distinctClassesAndSources)
   }

src/compiler/scala/tools/nsc/classpath/DirectoryClassPath.scala

@@ -63,7 +63,9 @@ trait DirectoryLookup[FileEntryType <: ClassRepresentation] extends EfficientCla
       case None => emptyFiles
       case Some(directory) => listChildren(directory, Some(isPackage))
     }
-    nestedDirs.map(f => PackageEntryImpl(inPackage.entryName(getName(f))))
+    scala.collection.immutable.ArraySeq.unsafeWrapArray(
+      nestedDirs.map(f => PackageEntryImpl(inPackage.entryName(getName(f))))
+    )
   }
 
   protected def files(inPackage: PackageName): Seq[FileEntryType] = {
@@ -230,7 +232,7 @@ final class JrtClassPath(fs: java.nio.file.FileSystem) extends ClassPath with No
 final class CtSymClassPath(ctSym: java.nio.file.Path, release: Int) extends ClassPath with NoSourcePaths with Closeable {
   import java.nio.file.Path, java.nio.file._
 
-  private val fileSystem: FileSystem = FileSystems.newFileSystem(ctSym, null)
+  private val fileSystem: FileSystem = FileSystems.newFileSystem(ctSym, null: ClassLoader)
   private val root: Path = fileSystem.getRootDirectories.iterator.next
   private val roots = Files.newDirectoryStream(root).iterator.asScala.toList
 
@@ -317,7 +319,7 @@ case class DirectorySourcePath(dir: File) extends JFileDirectoryLookup[SourceFil
 
   private def findSourceFile(className: String): Option[AbstractFile] = {
     val relativePath = FileUtils.dirPath(className)
-    val sourceFile = Stream("scala", "java")
+    val sourceFile = Iterator("scala", "java")
       .map(ext => new File(s"$dir/$relativePath.$ext"))
       .collectFirst { case file if file.exists() => file }
 

src/compiler/scala/tools/nsc/plugins/OutputFileWriter.scala

@@ -15,5 +15,5 @@ package scala.tools.nsc.plugins
 import scala.reflect.io.AbstractFile
 
 trait OutputFileWriter {
-  def writeFile(relativeName: String, data: Array[Byte], outputDir: AbstractFile)
+  def writeFile(relativeName: String, data: Array[Byte], outputDir: AbstractFile): Unit
 }

src/compiler/scala/tools/nsc/profile/Profiler.scala

@@ -172,7 +172,7 @@ private [profile] class RealProfiler(reporter : ProfileReporter, val settings: S
     reporter.reportBackground(this, threadRange)
   }
 
-  def outDir = settings.outputDirs.getSingleOutput.getOrElse(settings.outputDirs.outputs.head._2.file).toString
+  def outDir = settings.outputDirs.getSingleOutput.map(_.path).getOrElse(settings.outputDirs.outputs.head._2.path)
 
   RealProfiler.gcMx foreach {
     case emitter: NotificationEmitter => emitter.addNotificationListener(this, null, null)
@@ -181,7 +181,7 @@ private [profile] class RealProfiler(reporter : ProfileReporter, val settings: S
 
   val active = RealProfiler.allPlugins map (_.generate(this, settings))
 
-  private def doGC: Unit = {
+  private def doGC(): Unit = {
     System.gc()
     System.runFinalization()
   }
@@ -241,7 +241,7 @@ private [profile] class RealProfiler(reporter : ProfileReporter, val settings: S
     assert(mainThread eq Thread.currentThread())
     if (chromeTrace != null) chromeTrace.traceDurationEventStart(Category.Phase, phase.name)
     if (settings.YprofileRunGcBetweenPhases.containsPhase(phase))
-      doGC
+      doGC()
     if (settings.YprofileExternalTool.containsPhase(phase)) {
       println("Profile hook start")
       ExternalToolHook.before()
@@ -259,7 +259,7 @@ private [profile] class RealProfiler(reporter : ProfileReporter, val settings: S
       ExternalToolHook.after()
     }
     val finalSnap = if (settings.YprofileRunGcBetweenPhases.containsPhase(phase)) {
-      doGC
+      doGC()
       initialSnap.updateHeap(RealProfiler.readHeapUsage())
     } else initialSnap
     if (chromeTrace != null) chromeTrace.traceDurationEventEnd(Category.Phase, phase.name)

src/compiler/scala/tools/nsc/reporters/StoreReporter.scala

@@ -20,13 +20,13 @@ import scala.reflect.internal.util.Position
 
 /** This class implements a Reporter that stores its reports in the set `infos`. */
 class StoreReporter(val settings: Settings) extends FilteringReporter {
-  @deprecated("use the constructor with a `Settings` parameter", "2.13.1")
+  @deprecated("use the constructor with a `Settings` parameter", since = "2.13.1")
   def this() = this(new Settings())
 
-  @deprecated("use StoreReporter.Info") // used in scalameta for example
+  @deprecated("use StoreReporter.Info", since = "2.13.0") // used in scalameta for example
   type Info = StoreReporter.Info
 
-  @deprecated("use StoreReporter.Info")
+  @deprecated("use StoreReporter.Info", since = "2.13.0")
   @uncheckedStable def Info: StoreReporter.Info.type = StoreReporter.Info
 
   val infos = new mutable.LinkedHashSet[StoreReporter.Info]

src/compiler/scala/tools/nsc/settings/Warnings.scala

@@ -115,6 +115,7 @@ trait Warnings {
     val EtaSam                 = LintWarning("eta-sam",                   "The Java-defined target interface for eta-expansion was not annotated @FunctionalInterface.")
     val Deprecation            = LintWarning("deprecation",               "Enable -deprecation and also check @deprecated annotations.")
     val ByNameImplicit         = LintWarning("byname-implicit",           "Block adapted by implicit with by-name parameter.")
+    val RecurseWithDefault     = LintWarning("recurse-with-default",      "Recursive call used default argument.")
 
     def allLintWarnings = values.toSeq.asInstanceOf[Seq[LintWarning]]
   }
@@ -144,6 +145,7 @@ trait Warnings {
   def warnEtaSam                 = lint contains EtaSam
   def lintDeprecation            = lint contains Deprecation
   def warnByNameImplicit         = lint contains ByNameImplicit
+  def warnRecurseWithDefault     = lint contains RecurseWithDefault
 
   // The Xlint warning group.
   val lint = MultiChoiceSetting(