Fix the super constructor call to DynamicImportThunk.

sjrd · sjrd · commit 13a134b053e4 · 2024-08-24T13:44:51.000+02:00
And only enable the corresponding deserialization hack for
IR &lt; 1.17.
diff --git a/compiler/src/main/scala/org/scalajs/nscplugin/PrepJSInterop.scala b/compiler/src/main/scala/org/scalajs/nscplugin/PrepJSInterop.scala
@@ -475,7 +475,7 @@ abstract class PrepJSInterop[G <: Global with Singleton](val global: G)
                */
               val superCtorCall = gen.mkMethodCall(
                   Super(clsSym, tpnme.EMPTY),
-                  ObjectClass.primaryConstructor, Nil, Nil)
+                  DynamicImportThunkClass.primaryConstructor, Nil, Nil)
 
               // class $anon extends DynamicImportThunk
               val clsDef = ClassDef(clsSym, List(
diff --git a/ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala b/ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala
@@ -1438,7 +1438,7 @@ object Serializers {
       val superClass = readOptClassIdent()
       val parents = readClassIdents()
 
-      if (/* hacks.use16 &&*/ kind.isClass) { // scalastyle:ignore
+      if (hacks.use16 && kind.isClass) {
         /* In 1.17, we started enforcing the constructor chaining discipline.
          * Unfortunately, we used to generate a wrong super constructor call in
          * synthetic classes extending `DynamicImportThunk`, so we patch them.
