Upgrade to GCC v20240317. Require JDK 17+.

sjrd · sjrd · commit d6fcbb282fd6 · 2025-07-30T16:35:26.000+02:00
This fixes the issue where GCC breaks the output of the new
expanded RuntimeLongs.
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ '8' ]
+        java: [ '17' ]
 
     # Use the latest supported version. We will be less affected by ambient changes
     # due to the lack of pinning than by breakages because of changing version support.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -523,8 +523,8 @@ def Tasks = [
   '''
 ]
 
-def mainJavaVersion = "1.8"
-def otherJavaVersions = ["11", "17", "21"]
+def mainJavaVersion = "17"
+def otherJavaVersions = ["21"]
 def allJavaVersions = otherJavaVersions.clone()
 allJavaVersions << mainJavaVersion
 
diff --git a/linker/jvm/src/main/scala/org/scalajs/linker/backend/closure/ClosureAstTransformer.scala b/linker/jvm/src/main/scala/org/scalajs/linker/backend/closure/ClosureAstTransformer.scala
@@ -445,7 +445,7 @@ private class ClosureAstTransformer(featureSet: FeatureSet,
 
       case StringLiteral(name) =>
         val node = Node.newString(Token.STRING_KEY, name)
-        node.setQuotedString()
+        node.setQuotedStringKey()
         node
 
       case ComputedName(nameExpr) =>
diff --git a/linker/jvm/src/main/scala/org/scalajs/linker/backend/closure/ClosureLinkerBackend.scala b/linker/jvm/src/main/scala/org/scalajs/linker/backend/closure/ClosureLinkerBackend.scala
@@ -154,7 +154,7 @@ final class ClosureLinkerBackend(config: LinkerBackendImpl.Config)
         new LoggerErrorReportGenerator(logger)))))
 
     val result =
-      compiler.compileModules(externs, Arrays.asList(chunk), options)
+      compiler.compileChunks(externs, Arrays.asList(chunk), options)
 
     if (!result.success) {
       throw new LinkingException(
diff --git a/partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.20/run/t6827.check b/partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.20/run/t6827.check
@@ -0,0 +1,15 @@
+start at -5: java.lang.ArrayIndexOutOfBoundsException: -5
+start at -1: java.lang.ArrayIndexOutOfBoundsException: -1
+start at limit: ok
+start at limit-1: ok
+first 10: ok
+read all: ok
+test huge len: ok
+5 from 5: ok
+20 from 5: ok
+test len overflow: ok
+start beyond limit: ok
+read 0: ok
+read -1: ok
+invalid read 0: ok
+invalid read -1: ok
diff --git a/partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.16/BlacklistedTests.txt b/partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.16/BlacklistedTests.txt
@@ -94,6 +94,7 @@ run/predef-cycle.scala
 run/synchronized.scala
 run/sd409.scala
 run/t12572.scala
+run/t12918.scala
 run/deadlock.scala
 
 # Uses java.security
diff --git a/partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.16/run/t6827.check b/partest-suite/src/test/resources/scala/tools/partest/scalajs/2.13.16/run/t6827.check
@@ -0,0 +1,15 @@
+start at -5: java.lang.ArrayIndexOutOfBoundsException: -5
+start at -1: java.lang.ArrayIndexOutOfBoundsException: -1
+start at limit: ok
+start at limit-1: ok
+first 10: ok
+read all: ok
+test huge len: ok
+5 from 5: ok
+20 from 5: ok
+test len overflow: ok
+start beyond limit: ok
+read 0: ok
+read -1: ok
+invalid read 0: ok
+invalid read -1: ok
diff --git a/project/Build.scala b/project/Build.scala
@@ -1330,7 +1330,7 @@ object Build {
       commonLinkerSettings,
 
       libraryDependencies ++= Seq(
-          "com.google.javascript" % "closure-compiler" % "v20220202",
+          "com.google.javascript" % "closure-compiler" % "v20240317",
           "com.google.jimfs" % "jimfs" % "1.1" % "test",
           "org.scala-js" %% "scalajs-env-nodejs" % "1.4.0" % "test",
           "org.scala-js" %% "scalajs-js-envs-test-kit" % "1.4.0" % "test"
@@ -2566,9 +2566,6 @@ object Build {
       testSuiteExCommonSettings(isJSTest = true),
       name := "Scala.js test suite ex",
       publishArtifact in Compile := false,
-
-      // FIXME Closure breaks the new Longs in this project
-      Test/fullLinkJS/scalaJSLinkerConfig ~= { _.withClosureCompiler(false) },
   ).withScalaJSCompiler.withScalaJSJUnitPlugin.dependsOnLibrary.dependsOn(
       javalibExtDummies, jUnitRuntime, testBridge % "test", testSuite
   )
@@ -2762,9 +2759,6 @@ object Build {
       NoIDEExport.noIDEExportSettings,
 
       testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-s"),
-
-      // FIXME Closure breaks the new Longs in this project
-      Test/fullLinkJS/scalaJSLinkerConfig ~= { _.withClosureCompiler(false) },
   ).zippedSettings(partest)(partest =>
       unmanagedSources in Compile ++= {
         val scalaV = scalaVersion.value

Original file line number	Diff line number	Diff line change
`@@ -523,8 +523,8 @@ def Tasks = [`
`523`	`523`	`'''`
`524`	`524`	`]`
`525`	`525`
`526`		`-def mainJavaVersion = "1.8"`
`527`		`-def otherJavaVersions = ["11", "17", "21"]`
	`526`	`+def mainJavaVersion = "17"`
	`527`	`+def otherJavaVersions = ["21"]`
`528`	`528`	`def allJavaVersions = otherJavaVersions.clone()`
`529`	`529`	`allJavaVersions << mainJavaVersion`
`530`	`530`