Merge pull request #5103 from sjrd/remove-dead-code-in-optimizercore

sjrd · web-flow · commit a0c02783edf6 · 2025-01-05T18:44:42.000+01:00
Remove dead code in OptimizerCore.
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/frontend/optimizer/OptimizerCore.scala b/linker/shared/src/main/scala/org/scalajs/linker/frontend/optimizer/OptimizerCore.scala
@@ -384,7 +384,7 @@ private[optimizer] abstract class OptimizerCore(
              * `Return`s we produce in order to decide whether we can remove
              * the `Labeled`.
              */
-            info.returnedTreeTypes.value ::= RefinedType.NoRefinedType
+            info.returnedTreeTypes.value ::= RefinedType(VoidType)
             Return(newExpr, newLabel)
           }
         } else if (!info.acceptRecords) {
@@ -5725,8 +5725,6 @@ private[optimizer] object OptimizerCore {
   private final class TooManyRollbacksException
       extends scala.util.control.ControlThrowable
 
-  private val AnonFunctionClassPrefix = "sjsr_AnonFunction"
-
   private type CancelFun = () => Nothing
   private type PreTransCont = PreTransform => TailRec[Tree]
 
@@ -5736,12 +5734,6 @@ private[optimizer] object OptimizerCore {
     def isNullable: Boolean = base.isNullable
 
     def isNothingType: Boolean = base == NothingType
-
-    def toNonNullable: RefinedType = {
-      if (!isNullable) this
-      else if (base == NullType) RefinedType.Nothing
-      else RefinedType(base.toNonNullable, isExact, allocationSite)
-    }
   }
 
   private object RefinedType {
@@ -5766,9 +5758,6 @@ private[optimizer] object OptimizerCore {
       }
       RefinedType(tpe, isExact)
     }
-
-    val NoRefinedType = RefinedType(VoidType)
-    val Nothing = RefinedType(NothingType)
   }
 
   /**
@@ -6018,12 +6007,6 @@ private[optimizer] object OptimizerCore {
       copy(implsBeingInlined = implsBeingInlined + impl)
     }
 
-    def inlining(impls: Set[Scope.InliningID]): Scope = {
-      val intersection = implsBeingInlined.intersect(impls)
-      assert(intersection.isEmpty, s"Circular inlining of $intersection")
-      copy(implsBeingInlined = implsBeingInlined ++ impls)
-    }
-
     def withImportReplacement(importReplacement: ImportReplacement): Scope = {
       assert(this.importReplacement.isEmpty, "Alreadying replacing " +
           s"$this.importReplacement while trying to replace $importReplacement")
@@ -6418,10 +6401,6 @@ private[optimizer] object OptimizerCore {
     if (y >= 0) x-y <= x
     else        x-y >  x
 
-  /** Tests whether `-x` is valid without falling out of range. */
-  private def canNegateLong(x: Long): Boolean =
-    x != Long.MinValue
-
   private final class Intrinsics(intrinsicsMap: Map[(ClassName, MethodName), Int]) {
     def apply(flags: ApplyFlags, target: AbstractMethodID): Int = {
       if (flags.isPrivate || flags.isConstructor) {
