Mitigate refactor of dotty.tools.dotc.transform.SymUtils

Author: WojciechMazur

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/CompilerCompat.scala

@@ -0,0 +1,15 @@
+package scala.scalanative.nscplugin
+
+object CompilerCompat {
+
+  private object SymUtilsCompatDef:
+    val SymUtils = dotty.tools.dotc.core.Symbols
+  
+  private object SymUtilsCompatSelect:
+    import SymUtilsCompatDef._
+    object Inner {
+      import dotty.tools.dotc.transform._
+      val SymUtilsAlias = SymUtils
+    }
+  val SymUtilsCompat = SymUtilsCompatSelect.Inner.SymUtilsAlias
+}

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/GenNativeExports.scala

@@ -9,7 +9,7 @@ import core.Symbols._
 import core.Flags._
 import core.Annotations.*
 import dotty.tools.dotc.report
-import dotty.tools.dotc.transform.SymUtils.*
+import scala.scalanative.nscplugin.CompilerCompat.SymUtilsCompat.*
 
 import scala.scalanative.nir
 import nir._

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirGenExpr.scala

@@ -21,9 +21,9 @@ import core._
 import dotty.tools.FatalError
 import dotty.tools.dotc.report
 import dotty.tools.dotc.transform
-import transform.SymUtils._
 import transform.{ValueClasses, Erasure}
 import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
+import scala.scalanative.nscplugin.CompilerCompat.SymUtilsCompat.*
 
 import scala.scalanative.nir
 import nir._

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirGenName.scala

@@ -6,12 +6,12 @@ import core.Contexts._
 import core.Symbols._
 import core.Flags._
 import core.StdNames._
-import dotty.tools.dotc.transform.SymUtils._
-import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
+import scala.scalanative.nscplugin.CompilerCompat.SymUtilsCompat.*
 import scalanative.util.unreachable
 import scala.scalanative.nir
 import scala.scalanative.nir._
 import scala.language.implicitConversions
+import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions
 
 trait NirGenName(using Context) {
   self: NirCodeGen =>

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirGenStat.scala

@@ -10,7 +10,7 @@ import core.Constants._
 import core.StdNames._
 import core.Flags._
 import core.Phases._
-import dotty.tools.dotc.transform.SymUtils._
+import scala.scalanative.nscplugin.CompilerCompat.SymUtilsCompat._
 
 import scala.collection.mutable
 import scala.scalanative.nir
@@ -651,7 +651,7 @@ trait NirGenStat(using Context) {
 
     def isInheritedField(f: Symbol) =
       classSym.directlyInheritedTraits.exists {
-        _.info.decls.exists(_ matches f.getter)
+        _.info.decls.exists(_.matches(f.getter))
       }
 
     for f <- classSym.info.decls

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirGenType.scala

@@ -14,7 +14,7 @@ import core.TypeErasure._
 import core.TypeError
 import dotty.tools.dotc.report
 import dotty.tools.dotc.typer.TyperPhase
-import dotty.tools.dotc.transform.SymUtils._
+import scala.scalanative.nscplugin.CompilerCompat.SymUtilsCompat.*
 
 import scala.scalanative.nir
 import scala.scalanative.util.unsupported

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirGenUtil.scala

@@ -9,6 +9,7 @@ import scala.scalanative.util.ScopedVar
 import scalanative.nir.{Fresh, Local, LocalName}
 import scala.collection.mutable
 import scala.scalanative.nir
+import scala.compiletime.uninitialized
 
 trait NirGenUtil(using Context) { self: NirCodeGen =>
 
@@ -74,8 +75,8 @@ trait NirGenUtil(using Context) { self: NirCodeGen =>
 
 object NirGenUtil {
   class ContextCached[T](init: Context ?=> T) {
-    private var lastContext: Context = _
-    private var cached: T = _
+    private var lastContext: Context = uninitialized
+    private var cached: T = uninitialized
 
     def get(using Context): T = {
       if (lastContext != ctx) {

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirPositions.scala

@@ -7,6 +7,7 @@ import dotty.tools.dotc.util.{SourceFile, SourcePosition}
 import dotty.tools.dotc.util.Spans.Span
 import GenNIR.URIMap
 import scalanative.nir
+import scala.compiletime.uninitialized
 
 class NirPositions(sourceURIMaps: List[GenNIR.URIMap])(using Context) {
   given fromSourcePosition: Conversion[SourcePosition, nir.Position] = {
@@ -33,8 +34,8 @@ class NirPositions(sourceURIMaps: List[GenNIR.URIMap])(using Context) {
 
   private object conversionCache {
     import dotty.tools.dotc.util._
-    private var lastDotcSource: SourceFile = _
-    private var lastNIRSource: nir.Position.SourceFile = _
+    private var lastDotcSource: SourceFile = uninitialized
+    private var lastNIRSource: nir.Position.SourceFile = uninitialized
 
     def toNIRSource(dotcSource: SourceFile): nir.Position.SourceFile = {
       if (dotcSource != lastDotcSource) {

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirPrimitives.scala

@@ -143,7 +143,7 @@ class NirPrimitives(using ctx: Context) extends DottyPrimitives(ctx) {
     val primitives = MutableSymbolMap[Int]()
 
     def addPrimitive(s: Symbol, code: Int) = {
-      assert(!(primitives contains s), "Duplicate primitive " + s)
+      assert(!(primitives.contains(s)), "Duplicate primitive " + s)
       assert(s.exists, s"Empty symbol with code $code")
       primitives(s) = code
     }

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/PostInlineNativeInterop.scala

@@ -4,7 +4,7 @@ import dotty.tools.dotc.plugins.PluginPhase
 import dotty.tools._
 import dotc._
 import dotc.ast.tpd._
-import dotc.transform.SymUtils.setter
+import scala.scalanative.nscplugin.CompilerCompat.SymUtilsCompat.setter
 import core.Contexts._
 import core.Definitions
 import core.Names._

nscplugin/src/main/scala-3/scala/scalanative/nscplugin/PrepNativeInterop.scala

@@ -4,7 +4,7 @@ import dotty.tools.dotc.plugins.PluginPhase
 import dotty.tools._
 import dotc._
 import dotc.ast.tpd._
-import dotc.transform.SymUtils._
+import scala.scalanative.nscplugin.CompilerCompat.SymUtilsCompat.*
 import core.Contexts._
 import core.Definitions
 import core.Names._
@@ -103,11 +103,11 @@ class PrepNativeInterop extends PluginPhase with NativeInteropUtil {
     vd match {
       case ValDef(_, tpt, ScalaEnumValue.NoName(optIntParam)) =>
         val nrhs = scalaEnumValName(sym.owner.asClass, sym, optIntParam)
-        cpy.ValDef(vd)(tpt = transformAllDeep(tpt), nrhs)
+        cpy.ValDef(vd)(tpt = transformAllDeep(tpt), rhs = nrhs)
 
       case ValDef(_, tpt, ScalaEnumValue.NullName(optIntParam)) =>
         val nrhs = scalaEnumValName(sym.owner.asClass, sym, optIntParam)
-        cpy.ValDef(vd)(tpt = transformAllDeep(tpt), nrhs)
+        cpy.ValDef(vd)(tpt = transformAllDeep(tpt), rhs = nrhs)
 
       case _ =>
         // Set `@extern` annotation for top-level extern variables