Use ClearableLinker to recover from exceptions in Scala.js (#1891)

Pull request: #1891
com-lihaoyi · Jun 3, 2022 · eb6204d · eb6204d
1 parent 1a2fbde
commit eb6204d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala b/scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala
@@ -9,6 +9,7 @@ import org.scalajs.core.tools.io.IRFileCache.IRContainer
 import org.scalajs.core.tools.io._
 import org.scalajs.core.tools.jsdep.ResolvedJSDependency
 import org.scalajs.core.tools.linker.{
+  ClearableLinker,
   ESFeatures => ScalaJSESFeatures,
   Linker,
   ModuleInitializer,
@@ -31,15 +32,15 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
       esFeatures: ESFeatures
   )
   private object ScalaJSLinker {
-    private val cache = mutable.Map.empty[LinkerInput, WeakReference[Linker]]
-    def reuseOrCreate(input: LinkerInput): Linker = cache.get(input) match {
+    private val cache = mutable.Map.empty[LinkerInput, WeakReference[ClearableLinker]]
+    def reuseOrCreate(input: LinkerInput): ClearableLinker = cache.get(input) match {
       case Some(WeakReference(linker)) => linker
       case _ =>
         val newLinker = createLinker(input)
         cache.update(input, WeakReference(newLinker))
         newLinker
     }
-    private def createLinker(input: LinkerInput): Linker = {
+    private def createLinker(input: LinkerInput): ClearableLinker = {
       val semantics = input.isFullLinkJS match {
         case true => Semantics.Defaults.optimized
         case false => Semantics.Defaults
@@ -65,7 +66,8 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
         .withSemantics(semantics)
         .withModuleKind(scalaJSModuleKind)
         .withESFeatures(scalaJSESFeatures)
-      StandardLinker(config)
+
+      new ClearableLinker(() => StandardLinker(config), config.batchMode)
     }
   }
 

diff --git a/scalajslib/worker/1/src/ScalaJSWorkerImpl.scala b/scalajslib/worker/1/src/ScalaJSWorkerImpl.scala
@@ -149,7 +149,7 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
         if (minorIsGreaterThanOrEqual(3)) withModuleSplitStyle_1_3_plus(partialConfig)
         else withModuleSplitStyle_1_2_minus(partialConfig)
 
-      StandardImpl.linker(config)
+      StandardImpl.clearableLinker(config)
     }
   }
   def link(