Merge with main at #17340

Author: schuetzcarl

.github/PULL_REQUEST_TEMPLATE/fix-issue.md

@@ -6,14 +6,14 @@ assignees: ''
 
 ---
 
-<!-- 
-  TODO first sign the CLA 
+<!--
+  TODO first sign the CLA
   https://www.lightbend.com/contribute/cla/scala
 -->
 
 ## Fix #XYZ
 
-<!-- TODO description of the change --> 
+<!-- TODO description of the change -->
 
 
 <!-- Ideally should have a called "Fix #XYZ: A SHORT FIX DESCRIPTION" -->

.github/PULL_REQUEST_TEMPLATE/other-pr.md

@@ -6,14 +6,14 @@ assignees: ''
 
 ---
 
-<!-- 
-  TODO first sign the CLA 
+<!--
+  TODO first sign the CLA
   https://www.lightbend.com/contribute/cla/scala
 -->
 
 ## Description
 
-<!-- TODO description of the change --> 
+<!-- TODO description of the change -->
 
 
 <!-- Ideally should have a single commit -->

.github/workflows/releases.yml

@@ -13,9 +13,9 @@ jobs:
       options: --cpu-shares 4096
 
     env:
-      SDKMAN_KEY: ${{ secrets.SDKMAN_KEY }} 
+      SDKMAN_KEY: ${{ secrets.SDKMAN_KEY }}
       SDKMAN_TOKEN: ${{ secrets.SDKMAN_TOKEN }}
-      
+
     steps:
       - name: Reset existing repo
         run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true

.github/workflows/scripts/publish-sdkman.sh

@@ -9,11 +9,11 @@
 
 set -u
 
-# latest stable dotty version 
+# latest stable dotty version
 DOTTY_VERSION=$(curl -s https://api.github.com/repos/lampepfl/dotty/releases/latest  | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
 DOTTY_URL="https://github.com/lampepfl/dotty/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip"
 
-# checking if dotty version is available 
+# checking if dotty version is available
 if ! curl --output /dev/null --silent --head --fail "$DOTTY_URL"; then
   echo "URL doesn't exist: $DOTTY_URL"
   exit 1

bench-micro/src/main/scala/dotty/tools/benchmarks/lazyvals/InitializedAccess.scala

@@ -18,7 +18,7 @@ class InitializedAccess {
 
   @Setup
   def prepare: Unit = {
-    holder = new LazyHolder 
+    holder = new LazyHolder
     holder.value
   }
 

bench-micro/src/main/scala/dotty/tools/benchmarks/lazyvals/InitializedAccessAny.scala

@@ -18,7 +18,7 @@ class InitializedAccessAny {
 
   @Setup
   def prepare: Unit = {
-    holder = new LazyAnyHolder 
+    holder = new LazyAnyHolder
     holder.value
   }
 

bench-micro/src/main/scala/dotty/tools/benchmarks/lazyvals/InitializedAccessGeneric.scala

@@ -18,7 +18,7 @@ class InitializedAccessGeneric {
 
   @Setup
   def prepare: Unit = {
-    holder = new LazyGenericHolder[String]("foo") 
+    holder = new LazyGenericHolder[String]("foo")
     holder.value
   }
 

bench-micro/src/main/scala/dotty/tools/benchmarks/lazyvals/InitializedAccessString.scala

@@ -18,7 +18,7 @@ class InitializedAccessString {
 
   @Setup
   def prepare: Unit = {
-    holder = new LazyStringHolder 
+    holder = new LazyStringHolder
     holder.value
   }
 

bench-micro/src/main/scala/dotty/tools/benchmarks/lazyvals/LazyVals.scala

@@ -21,7 +21,7 @@ object LazyVals {
             }
         }
     }
-    
+
     class LazyHolder {
 
         lazy val value: List[Int] = {

community-build/community-projects/requests-scala

@@ -35,6 +35,7 @@ class BackendUtils(val postProcessor: PostProcessor) {
     case "18" => asm.Opcodes.V18
     case "19" => asm.Opcodes.V19
     case "20" => asm.Opcodes.V20
+    case "21" => asm.Opcodes.V21
   }
 
   lazy val extraProc: Int = {

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

@@ -35,7 +35,7 @@ class Compiler {
   protected def frontendPhases: List[List[Phase]] =
     List(new Parser) ::             // Compiler frontend: scanner, parser
     List(new TyperPhase) ::         // Compiler frontend: namer, typer
-    List(new CheckUnused) ::        // Check for unused elements
+    List(new CheckUnused.PostTyper) ::  // Check for unused elements
     List(new YCheckPositions) ::    // YCheck positions
     List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
     List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
@@ -50,6 +50,7 @@ class Compiler {
     List(new Pickler) ::            // Generate TASTY info
     List(new Inlining) ::           // Inline and execute macros
     List(new PostInlining) ::       // Add mirror support for inlined code
+    List(new CheckUnused.PostInlining) ::  // Check for unused elements
     List(new Staging) ::            // Check staging levels and heal staged types
     List(new Splicing) ::           // Replace level 1 splices with holes
     List(new PickleQuotes) ::       // Turn quoted trees into explicit run-time data structures
@@ -58,7 +59,8 @@ class Compiler {
   /** Phases dealing with the transformation from pickled trees to backend trees */
   protected def transformPhases: List[List[Phase]] =
     List(new InstrumentCoverage) ::  // Perform instrumentation for code coverage (if -coverage-out is set)
-    List(new FirstTransform,         // Some transformations to put trees into a canonical form
+    List(new CrossVersionChecks,     // Check issues related to deprecated and experimental
+         new FirstTransform,         // Some transformations to put trees into a canonical form
          new CheckReentrant,         // Internal use only: Check that compiled program has no data races involving global vars
          new ElimPackagePrefixes,    // Eliminate references to package prefixes in Select nodes
          new CookComments,           // Cook the comments: expand variables, doc, etc.
@@ -70,8 +72,7 @@ class Compiler {
          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 CrossVersionChecks,     // Check issues related to deprecated and experimental
-         new ProtectedAccessors,     // Add accessors for protected members
+    List(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 ElimByName,             // Map by-name parameters to functions
@@ -89,7 +90,7 @@ class Compiler {
          new ExplicitOuter,          // Add accessors to outer classes from nested ones.
          new ExplicitSelf,           // Make references to non-trivial self types explicit as casts
          new StringInterpolatorOpt,  // Optimizes raw and s and f string interpolators by rewriting them to string concatenations or formats
-         new DropBreaks) ::          // Optimize local Break throws by rewriting them 
+         new DropBreaks) ::          // Optimize local Break throws by rewriting them
     List(new PruneErasedDefs,        // Drop erased definitions from scopes and simplify erased expressions
          new UninitializedDefs,      // Replaces `compiletime.uninitialized` by `_`
          new InlinePatterns,         // Remove placeholders of inlined patterns

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

@@ -30,16 +30,10 @@ class TreeMapWithImplicits extends tpd.TreeMapWithPreciseStatContexts {
 
   private def patternScopeCtx(pattern: Tree)(using Context): Context = {
     val nestedCtx = ctx.fresh.setNewScope
-    new TreeTraverser {
-      def traverse(tree: Tree)(using Context): Unit = {
-        tree match {
-          case d: DefTree if d.symbol.isOneOf(GivenOrImplicitVal) =>
-            nestedCtx.enter(d.symbol)
-          case _ =>
-        }
-        traverseChildren(tree)
-      }
-    }.traverse(pattern)
+    pattern.foreachSubTree {
+      case d: DefTree if d.symbol.isOneOf(GivenOrImplicitVal) => nestedCtx.enter(d.symbol)
+      case _ =>
+    }
     nestedCtx
   }
 

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

@@ -855,9 +855,9 @@ object Trees {
   }
 
   /** extends parents { self => body }
-   *  @param parentsOrDerived   A list of parents followed by a list of derived classes,
-   *                            if this is of class untpd.DerivingTemplate.
-   *                            Typed templates only have parents.
+   *  @param preParentsOrDerived A list of parents followed by a list of derived classes,
+   *                             if this is of class untpd.DerivingTemplate.
+   *                             Typed templates only have parents.
    */
   case class Template[+T <: Untyped] private[ast] (constr: DefDef[T], private var preParentsOrDerived: LazyTreeList[T], self: ValDef[T], private var preBody: LazyTreeList[T])(implicit @constructorOnly src: SourceFile)
     extends DefTree[T] with WithLazyFields {

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

@@ -1548,7 +1548,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
    *
    *  @param trees  the elements the list represented by
    *                the resulting tree should contain.
-   *  @param tpe    the type of the elements of the resulting list.
+   *  @param tpt    the type of the elements of the resulting list.
    *
    */
   def mkList(trees: List[Tree], tpt: Tree)(using Context): Tree =

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

@@ -262,7 +262,7 @@ extends tpd.TreeTraverser:
       // hard-coded expansion since $throws aliases in stdlib are defined with `?=>` rather than `?->`
       defn.FunctionOf(
         AnnotatedType(
-          defn.CanThrowClass.typeRef.appliedTo(exc), 
+          defn.CanThrowClass.typeRef.appliedTo(exc),
           Annotation(defn.ErasedParamAnnot, defn.CanThrowClass.span)) :: Nil,
         res,
         isContextual = true

compiler/src/dotty/tools/dotc/cc/Setup.scala

@@ -29,6 +29,7 @@ object Feature:
   val fewerBraces = experimental("fewerBraces")
   val saferExceptions = experimental("saferExceptions")
   val clauseInterleaving = experimental("clauseInterleaving")
+  val relaxedExtensionImports = experimental("relaxedExtensionImports")
   val pureFunctions = experimental("pureFunctions")
   val captureChecking = experimental("captureChecking")
   val into = experimental("into")

compiler/src/dotty/tools/dotc/config/Feature.scala

@@ -211,7 +211,7 @@ class PathResolver(using c: Context) {
     import classPathFactory._
 
     // Assemble the elements!
-    def basis: List[Traversable[ClassPath]] =
+    def basis: List[Iterable[ClassPath]] =
       val release = Option(ctx.settings.javaOutputVersion.value).filter(_.nonEmpty)
 
       List(

compiler/src/dotty/tools/dotc/config/PathResolver.scala

@@ -18,7 +18,7 @@ class ScalaSettings extends SettingGroup with AllScalaSettings
 object ScalaSettings:
   // Keep synchronized with `classfileVersion` in `BackendUtils`
   private val minTargetVersion = 8
-  private val maxTargetVersion = 20
+  private val maxTargetVersion = 21
 
   def supportedTargetVersions: List[String] =
     (minTargetVersion to maxTargetVersion).toList.map(_.toString)

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -194,7 +194,7 @@ object Annotations {
   object Annotation {
 
     def apply(tree: Tree): ConcreteAnnotation = ConcreteAnnotation(tree)
-    
+
     def apply(cls: ClassSymbol, span: Span)(using Context): Annotation =
       apply(cls, Nil, span)
 
@@ -206,7 +206,7 @@ object Annotations {
 
     def apply(atp: Type, arg: Tree, span: Span)(using Context): Annotation =
       apply(atp, arg :: Nil, span)
-    
+
     def apply(atp: Type, args: List[Tree], span: Span)(using Context): Annotation =
       apply(New(atp, args).withSpan(span))
 

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

@@ -444,6 +444,12 @@ object Contexts {
     def useColors: Boolean =
       base.settings.color.value == "always"
 
+    def withColors: FreshContext =
+      fresh.setSetting(ctx.settings.color, "always")
+
+    def withoutColors: FreshContext =
+      fresh.setSetting(ctx.settings.color, "never")
+
     /** Is the explicit nulls option set? */
     def explicitNulls: Boolean = base.settings.YexplicitNulls.value
 

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

@@ -1509,7 +1509,6 @@ class Definitions {
 
   /** Is an context function class.
    *   - ContextFunctionN for N >= 0
-   *   - ErasedContextFunctionN for N > 0
    */
   def isContextFunctionClass(cls: Symbol): Boolean = scalaClassName(cls).isContextFunction
 

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

@@ -299,7 +299,7 @@ object SymDenotations {
     }
 
     /** Add all given annotations to this symbol */
-    final def addAnnotations(annots: TraversableOnce[Annotation])(using Context): Unit =
+    final def addAnnotations(annots: IterableOnce[Annotation])(using Context): Unit =
       annots.iterator.foreach(addAnnotation)
 
     @tailrec
@@ -1407,9 +1407,9 @@ object SymDenotations {
         case Nil => Iterator.empty
       }
 
-    /** The symbol overriding this symbol in given subclass `ofclazz`.
+    /** The symbol overriding this symbol in given subclass `inClass`.
      *
-     *  @param ofclazz is a subclass of this symbol's owner
+     *  @pre `inClass` is a subclass of this symbol's owner
      */
     final def overridingSymbol(inClass: ClassSymbol)(using Context): Symbol =
       if (canMatchInheritedSymbols) matchingDecl(inClass, inClass.thisType)

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

@@ -40,7 +40,7 @@ object Symbols {
   val Ids: Property.Key[Array[String]] = new Property.Key
 
   /** A Symbol represents a Scala definition/declaration or a package.
-   *  @param coord  The coordinates of the symbol (a position or an index)
+   *  @param myCoord The coordinates of the symbol (a position or an index)
    *  @param id     A unique identifier of the symbol (unique per ContextBase)
    */
   class Symbol private[Symbols] (private var myCoord: Coord, val id: Int, val nestingLevel: Int)

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

@@ -591,7 +591,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
             val base = nonExprBaseType(tp1, cls2)
             if (base.typeSymbol == cls2) return true
           }
-          else if tp1.isLambdaSub && !tp1.isAnyKind then
+          else if tp1.typeParams.nonEmpty && !tp1.isAnyKind then
             return recur(tp1, EtaExpansion(tp2))
         fourthTry
     }