Merge pull request scala-js#34 from scala-js/main

tanishiking · web-flow · commit 62e89070ad82 · 2025-04-30T11:13:33.000+09:00
[pull] scala-wasm from scala-js:main
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
@@ -1536,6 +1536,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
`@@ -1536,6 +1536,7 @@ private class AnalyzerRun(config: CommonPhaseConfig, initial: Boolean,`
`1536`	`1536`	`lookupOrSynthesizeClass(className, SyntheticClassKind.Lambda(descriptor)) { lambdaClassInfo =>`
`1537`	`1537`	`lambdaClassInfo.instantiated()`
`1538`	`1538`	`lambdaClassInfo.callMethodStatically(MemberNamespace.Constructor, ctorName)`
	`1539`	`+ moduleUnit.addStaticDependency(lambdaClassInfo.className)`
`1539`	`1540`	`}`
`1540`	`1541`	`}`
`1541`	`1542`	`}`