Merge branch 'master' into remove-unnecessary-hyphen

Author: Xavientois

.github/workflows/ci.yaml

@@ -327,6 +327,12 @@ jobs:
  - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
  - ${{ github.workspace }}/../../cache/general:/root/.cache
  if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
+ || (
+ github.event_name == 'pull_request'
+ && !contains(github.event.pull_request.body, '[skip ci]')
+ && !contains(github.event.pull_request.body, '[skip community_build]')
+ && contains(github.event.pull_request.body, '[test_forward_compat]')
+ )
  || (
  github.event_name == 'workflow_dispatch'
  && github.repository == 'lampepfl/dotty'

.github/workflows/releases.yml

@@ -20,5 +20,8 @@ jobs:
  - name: Cleanup
  run: .github/workflows/cleanup.sh
 
+ - name: Git Checkout
+ uses: actions/checkout@v2
+
  - name: Publish to SDKMAN
  run: .github/workflows/scripts/publish-sdkman.sh

README.md

@@ -1,7 +1,7 @@
 Dotty
 =====
 [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster)
-[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://img.shields.io/discord/632150470000902164)
+[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala)
 
 * [Homepage](https://dotty.epfl.ch)
 * [Documentation](https://dotty.epfl.ch/docs)

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

@@ -20,7 +20,9 @@ import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 class CollectSuperCalls extends MiniPhase {
  import tpd._
 
- def phaseName: String = "collectSuperCalls"
+ override def phaseName: String = CollectSuperCalls.name
+
+ override def description: String = CollectSuperCalls.description
 
  override def transformSelect(tree: Select)(using Context): Tree = {
  tree.qualifier match {
@@ -40,3 +42,7 @@ class CollectSuperCalls extends MiniPhase {
  }
  }
 }
+
+object CollectSuperCalls:
+ val name: String = "collectSuperCalls"
+ val description: String = "find classes that are called with super"

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

@@ -34,7 +34,10 @@ import StdNames._
 import dotty.tools.io._
 
 class GenBCode extends Phase {
- def phaseName: String = GenBCode.name
+
+ override def phaseName: String = GenBCode.name
+
+ override def description: String = GenBCode.description
 
  private val superCallsMap = new MutableSymbolMap[Set[ClassSymbol]]
  def registerSuperCall(sym: Symbol, calls: ClassSymbol): Unit = {
@@ -106,6 +109,7 @@ class GenBCode extends Phase {
 
 object GenBCode {
  val name: String = "genBCode"
+ val description: String = "generate JVM bytecode"
 }
 
 class GenBCodePipeline(val int: DottyBackendInterface, val primitives: DottyPrimitives)(using Context) extends BCodeSyncAndTry {

compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala

@@ -6,11 +6,18 @@ import Phases._
 
 /** Generates Scala.js IR files for the compilation unit. */
 class GenSJSIR extends Phase {
- def phaseName: String = "genSJSIR"
+
+ override def phaseName: String = GenSJSIR.name
+
+ override def description: String = GenSJSIR.description
 
  override def isRunnable(using Context): Boolean =
  super.isRunnable && ctx.settings.scalajs.value
 
  def run(using Context): Unit =
  new JSCodeGen().run()
 }
+
+object GenSJSIR:
+ val name: String = "genSJSIR"
+ val description: String = "generate .sjsir files for Scala.js"

compiler/src/dotty/tools/backend/sjs/JSPositions.scala

@@ -39,11 +39,11 @@ class JSPositions()(using Context) {
  private def sourceAndSpan2irPos(source: SourceFile, span: Span): ir.Position = {
  if (!span.exists) ir.Position.NoPosition
  else {
- // dotty positions are 1-based but IR positions are 0-based
+ // dotty positions and IR positions are both 0-based
  val irSource = span2irPosCache.toIRSource(source)
  val point = span.point
- val line = source.offsetToLine(point) - 1
- val column = source.column(point) - 1
+ val line = source.offsetToLine(point)
+ val column = source.column(point)
  ir.Position(irSource, line, column)
  }
  }

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

@@ -7,9 +7,9 @@ import typer.{TyperPhase, RefChecks}
 import parsing.Parser
 import Phases.Phase
 import transform._
-import dotty.tools.backend.jvm.{CollectSuperCalls, GenBCode}
 import dotty.tools.backend
-import dotty.tools.dotc.transform.localopt.StringInterpolatorOpt
+import backend.jvm.{CollectSuperCalls, GenBCode}
+import localopt.StringInterpolatorOpt
 
 /** The central class of the dotc compiler. The job of a compiler is to create
  * runs, which process given `phases` in a given `rootContext`.
@@ -67,23 +67,24 @@ class Compiler {
  new CheckLoopingImplicits, // Check that implicit defs do not call themselves in an infinite loop
  new BetaReduce, // Reduce closure applications
  new InlineVals, // Check right hand-sides of an `inline val`s
- new ExpandSAMs) :: // Expand single abstract method closures to anonymous classes
+ new ExpandSAMs, // Expand single abstract method closures to anonymous classes
+ new ElimRepeated, // Rewrite vararg parameters and arguments
+ new RefChecks) :: // Various checks mostly related to abstract members and overriding
  List(new init.Checker) :: // Check initialization of objects
- List(new ElimRepeated,  // Rewrite vararg parameters and arguments
+ List(new CrossVersionChecks, // Check issues related to deprecated and experimental
  new ProtectedAccessors, // Add accessors for protected members
  new ExtensionMethods, // Expand methods of value classes with extension methods
  new UncacheGivenAliases, // Avoid caching RHS of simple parameterless given aliases
- new ByNameClosures, // Expand arguments to by-name parameters to closures
+ new ElimByName,  // Map by-name parameters to functions
  new HoistSuperArgs, // Hoist complex arguments of supercalls to enclosing scope
+ new ForwardDepChecks, // Check that there are no forward references to local vals
  new SpecializeApplyMethods, // Adds specialized methods to FunctionN
- new RefChecks, // Various checks mostly related to abstract members and overriding
  new TryCatchPatterns, // Compile cases in try/catch
  new PatternMatcher) :: // Compile pattern matches
  List(new ElimOpaque, // Turn opaque into normal aliases
  new sjs.ExplicitJSClasses, // Make all JS classes explicit (Scala.js only)
  new ExplicitOuter, // Add accessors to outer classes from nested ones.
  new ExplicitSelf, // Make references to non-trivial self types explicit as casts
- new ElimByName, // Expand by-name parameter references
  new StringInterpolatorOpt) :: // Optimizes raw and s string interpolators by rewriting them to string concatenations
  List(new PruneErasedDefs, // Drop erased definitions from scopes and simplify erased expressions
  new UninitializedDefs, // Replaces `compiletime.uninitialized` by `_`

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -783,7 +783,7 @@ object desugar {
  DefDef(
  className.toTermName, joinParams(constrTparams, defParamss),
  classTypeRef, creatorExpr)
- .withMods(companionMods | mods.flags.toTermFlags & GivenOrImplicit | Final)
+ .withMods(companionMods | mods.flags.toTermFlags & (GivenOrImplicit | Inline) | Final)
  .withSpan(cdef.span) :: Nil
  }
 
@@ -809,7 +809,9 @@ object desugar {
  Nil
  }
  }
- val classMods = if mods.is(Given) then mods | Synthetic else mods
+ if mods.isAllOf(Given | Inline | Transparent) then
+ report.error("inline given instances cannot be trasparent", cdef)
+ val classMods = if mods.is(Given) then mods &~ (Inline | Transparent) | Synthetic else mods
  cpy.TypeDef(cdef: TypeDef)(
  name = className,
  rhs = cpy.Template(impl)(constr, parents1, clsDerived, self1,

compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala

@@ -15,51 +15,12 @@ import scala.annotation.tailrec
  *
  * This incudes implicits defined in scope as well as imported implicits.
  */
-class TreeMapWithImplicits extends tpd.TreeMap {
+class TreeMapWithImplicits extends tpd.TreeMapWithPreciseStatContexts {
  import tpd._
 
  def transformSelf(vd: ValDef)(using Context): ValDef =
  cpy.ValDef(vd)(tpt = transform(vd.tpt))
 
- /** Transform statements, while maintaining import contexts and expression contexts
- * in the same way as Typer does. The code addresses additional concerns:
- * - be tail-recursive where possible
- * - don't re-allocate trees where nothing has changed
- */
- override def transformStats(stats: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = {
-
- @tailrec def traverse(curStats: List[Tree])(using Context): List[Tree] = {
-
- def recur(stats: List[Tree], changed: Tree, rest: List[Tree])(using Context): List[Tree] =
- if (stats eq curStats) {
- val rest1 = transformStats(rest, exprOwner)
- changed match {
- case Thicket(trees) => trees ::: rest1
- case tree => tree :: rest1
- }
- }
- else stats.head :: recur(stats.tail, changed, rest)
-
- curStats match {
- case stat :: rest =>
- val statCtx = stat match {
- case stat: DefTree => ctx
- case _ => ctx.exprContext(stat, exprOwner)
- }
- val restCtx = stat match {
- case stat: Import => ctx.importContext(stat, stat.symbol)
- case _ => ctx
- }
- val stat1 = transform(stat)(using statCtx)
- if (stat1 ne stat) recur(stats, stat1, rest)(using restCtx)
- else traverse(rest)(using restCtx)
- case nil =>
- stats
- }
- }
- traverse(stats)
- }
-
  private def nestedScopeCtx(defs: List[Tree])(using Context): Context = {
  val nestedCtx = ctx.fresh.setNewScope
  defs foreach {