Merge pull request scala-js#5160 from sjrd/fix-crash-with-modules-no-optimizer

sjrd · web-flow · commit 619202caa9bd · 2025-04-28T23:57:34.000+02:00
Fix scala-js#5159: Register static module dependency on used lambda classes.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -263,6 +263,11 @@ def Tasks = [
         'set scalaJSLinkerConfig in $testSuite.v$v ~= (_.withModuleSplitStyle(ModuleSplitStyle.SmallestModules))' \
         'set scalaJSLinkerConfig in $testSuite.v$v ~= (_.withModuleKind(ModuleKind.ESModule))' \
         $testSuite$v/test &&
+    sbtretry ++$scala 'set Global/enableMinifyEverywhere := $testMinify' \
+        'set scalaJSLinkerConfig in $testSuite.v$v ~= (_.withModuleSplitStyle(ModuleSplitStyle.SmallestModules))' \
+        'set scalaJSLinkerConfig in $testSuite.v$v ~= (_.withModuleKind(ModuleKind.ESModule))' \
+        'set scalaJSLinkerConfig in $testSuite.v$v ~= (_.withOptimizer(false))' \
+        $testSuite$v/test &&
     sbtretry ++$scala 'set Global/enableMinifyEverywhere := $testMinify' \
         'set scalaJSLinkerConfig in $testSuite.v$v ~= (_.withModuleSplitStyle(ModuleSplitStyle.SmallModulesFor(List("org.scalajs.testsuite"))))' \
         'set scalaJSLinkerConfig in $testSuite.v$v ~= (_.withModuleKind(ModuleKind.ESModule))' \
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/analyzer/Analyzer.scala b/linker/shared/src/main/scala/org/scalajs/linker/analyzer/Analyzer.scala
@@ -1488,6 +1488,7 @@ private class AnalyzerRun(config: CommonPhaseConfig, initial: Boolean,
         lookupOrSynthesizeClass(className, SyntheticClassKind.Lambda(descriptor)) { lambdaClassInfo =>
           lambdaClassInfo.instantiated()
           lambdaClassInfo.callMethodStatically(MemberNamespace.Constructor, ctorName)
+          moduleUnit.addStaticDependency(lambdaClassInfo.className)
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1488,6 +1488,7 @@ private class AnalyzerRun(config: CommonPhaseConfig, initial: Boolean,`
`1488`	`1488`	`lookupOrSynthesizeClass(className, SyntheticClassKind.Lambda(descriptor)) { lambdaClassInfo =>`
`1489`	`1489`	`lambdaClassInfo.instantiated()`
`1490`	`1490`	`lambdaClassInfo.callMethodStatically(MemberNamespace.Constructor, ctorName)`
	`1491`	`+ moduleUnit.addStaticDependency(lambdaClassInfo.className)`
`1491`	`1492`	`}`
`1492`	`1493`	`}`
`1493`	`1494`	`}`