bugfix: Fix compilation after merge conflicts

Author: tgodzik

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

@@ -54,11 +54,7 @@ object Settings:
 
     def deprecated(msg: String, extraArgs: List[String] = Nil): Settings.ArgsSummary =
       ArgsSummary(sstate, extraArgs ++ arguments.tail, errors, warnings :+ msg)
-
-  @unshared
-  val settingCharacters = "[a-zA-Z0-9_\\-]*".r
-  def validateSettingString(name: String): Unit =
-    assert(settingCharacters.matches(name), s"Setting string $name contains invalid characters")
+  }
 
   /** List of setting-value pairs that are required for another setting to be valid.
     * For example, `s = Setting(..., depends = List(YprofileEnabled -> true))`

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

@@ -333,7 +333,6 @@ object Phases {
 
       // Test that we are in a state where we need to check if the phase should be skipped for a java file,
       // this prevents checking the expensive `unit.typedAsJava` unnecessarily.
-      val doCheckJava = skipIfJava && !isAfterLastJavaPhase
       for unit <- units do ctx.profiler.onUnit(this, unit):
         given unitCtx: Context = runCtx.fresh.setPhase(this.start).setCompilationUnit(unit).withRootImports
         if ctx.run.enterUnit(unit) then

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

@@ -7,7 +7,6 @@ import java.nio.channels.ClosedByInterruptException
 
 import scala.util.control.NonFatal
 
-import dotty.tools.dotc.classpath.FileUtils.{hasTastyExtension, hasBetastyExtension}
 import dotty.tools.io.{ ClassPath, ClassRepresentation, AbstractFile, NoAbstractFile }
 import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
 
@@ -338,7 +337,7 @@ abstract class SymbolLoader extends LazyType { self =>
     val sym = root.symbol
     def associatedFile = root.symbol.associatedFile match
       case file: AbstractFile => file
-      case _ => NoAbstractFile
+      case null => NoAbstractFile
     ctx.profiler.onCompletion(sym, associatedFile)(body)
   }
 

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

@@ -917,7 +917,7 @@ object TypeOps:
     }
 
     val inferThisMap = new InferPrefixMap
-    val tvars = tp1.etaExpand match
+    val tvars = tp1.EtaExpand(tp1.typeParams) match
       case eta: TypeLambda => constrained(eta)
       case _               => Nil
     val protoTp1 = inferThisMap.apply(tp1).appliedTo(tvars)

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -2490,19 +2490,6 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
     if filters == List(MessageFilter.None) then sup.markUsed()
     ctx.run.nn.suppressions.addSuppression(sup)
 
-  /** Run `typed` on `rhs` except if `rhs` is the right hand side of a deferred given,
-   *  in which case the empty tree is returned.
-   */
-  private inline def excludeDeferredGiven(
-      rhs: untpd.Tree, sym: Symbol)(
-      inline typed: untpd.Tree => Tree)(using Context): Tree =
-    rhs match
-      case rhs: RefTree
-      if rhs.name == nme.deferred && sym.isAllOf(DeferredGivenFlags, butNot = Param) =>
-        EmptyTree
-      case _ =>
-        typed(rhs)
-
   def typedValDef(vdef: untpd.ValDef, sym: Symbol)(using Context): Tree = ctx.profiler.onTypedDef(sym) {
     val ValDef(name, tpt, _) = vdef
     completeAnnotations(vdef, sym)