Insert StoreModules for JS module classes in the compiler.

sjrd · sjrd · commit 85a8eb5d2d09 · 2024-11-03T09:03:48.000+01:00
And only enable the deserialization when reading IR &lt; 1.18.
diff --git a/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala b/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala
@@ -1610,7 +1610,7 @@ abstract class GenJSCode[G <: Global with Singleton](val global: G)
 
       var preSuperStats = List.newBuilder[js.Tree]
       var jsSuperCall: Option[js.JSSuperConstructorCall] = None
-      val postSuperStats = List.newBuilder[js.Tree]
+      val postSuperStats = mutable.ListBuffer.empty[js.Tree]
 
       /* Move param accessor initializers and early initializers after the
        * super constructor call since JS cannot access `this` before the super
@@ -1714,6 +1714,13 @@ abstract class GenJSCode[G <: Global with Singleton](val global: G)
       assert(jsSuperCall.isDefined, "Did not find Super call in primary JS " +
           s"construtor at ${dd.pos}")
 
+      /* Insert a StoreModule if required.
+       * Do this now so we have the pos of the super ctor call.
+       * +=: prepends to the ListBuffer in O(1) -- yes, it's a cryptic name.
+       */
+      if (isStaticModule(currentClassSym))
+        js.StoreModule()(jsSuperCall.get.pos) +=: postSuperStats
+
       new PrimaryJSCtor(sym, genParamsAndInfo(sym, vparamss),
           js.JSConstructorBody(preSuperStats.result(), jsSuperCall.get, postSuperStats.result())(dd.pos))
     }
diff --git a/ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala b/ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala
@@ -2005,7 +2005,7 @@ object Serializers {
       val superCall = readTree().asInstanceOf[JSSuperConstructorCall]
       val afterSuper0 = readTrees()
 
-      val afterSuper = if (true /*hacks.use17*/ && ownerKind == ClassKind.JSModuleClass) {
+      val afterSuper = if (hacks.use17 && ownerKind == ClassKind.JSModuleClass) {
         afterSuper0 match {
           case StoreModule() :: _ => afterSuper0
           case _                  => StoreModule()(superCall.pos) :: afterSuper0
