From c5b459a59c1585e44dc9b546f20e835dc3369cc2 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 13 Nov 2025 17:14:31 -0600 Subject: [PATCH] Upgrade ASM to 9.9 for JDK 26 support --- compiler/src/dotty/tools/backend/jvm/BackendUtils.scala | 3 ++- project/Build.scala | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala b/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala index 653fa3e7bbdb..4322a306f411 100644 --- a/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala +++ b/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala @@ -186,6 +186,7 @@ object BackendUtils { 22 -> asm.Opcodes.V22, 23 -> asm.Opcodes.V23, 24 -> asm.Opcodes.V24, - 25 -> asm.Opcodes.V25 + 25 -> asm.Opcodes.V25, + 26 -> asm.Opcodes.V26, ) } diff --git a/project/Build.scala b/project/Build.scala index cddf225f3475..99b9e6e88719 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -752,7 +752,7 @@ object Build { // get libraries onboard libraryDependencies ++= Seq( - "org.scala-lang.modules" % "scala-asm" % "9.8.0-scala-1", // used by the backend + "org.scala-lang.modules" % "scala-asm" % "9.9.0-scala-1", // used by the backend Dependencies.compilerInterface, ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13), ), @@ -2452,7 +2452,7 @@ object Build { // All the dependencies needed by the compiler libraryDependencies ++= Seq( "com.github.sbt" % "junit-interface" % "0.13.3" % Test, - "org.scala-lang.modules" % "scala-asm" % "9.8.0-scala-1", + "org.scala-lang.modules" % "scala-asm" % "9.9.0-scala-1", Dependencies.compilerInterface, ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13), ), @@ -2601,7 +2601,7 @@ object Build { Test / unmanagedResourceDirectories += baseDirectory.value / "test-resources", // All the dependencies needed by the compiler libraryDependencies ++= Seq( - "org.scala-lang.modules" % "scala-asm" % "9.8.0-scala-1", + "org.scala-lang.modules" % "scala-asm" % "9.9.0-scala-1", Dependencies.compilerInterface, "com.github.sbt" % "junit-interface" % "0.13.3" % Test, ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),