Backport "Update asm to 9.6" to LTS (#20721)

Backports #18712 to the LTS branch. PR submitted by the release tooling. [skip ci]
scala · Jun 22, 2024 · 3edb4a7 · 3edb4a7
2 parents 9f11d0d + 2046d25
commit 3edb4a7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala b/compiler/src/dotty/tools/backend/jvm/BackendUtils.scala
@@ -36,6 +36,7 @@ class BackendUtils(val postProcessor: PostProcessor) {
     case "19" => asm.Opcodes.V19
     case "20" => asm.Opcodes.V20
     case "21" => asm.Opcodes.V21
+    case "22" => asm.Opcodes.V22
   }
 
   lazy val extraProc: Int = {

diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -18,7 +18,7 @@ class ScalaSettings extends SettingGroup with AllScalaSettings
 object ScalaSettings:
   // Keep synchronized with `classfileVersion` in `BackendUtils`
   private val minTargetVersion = 8
-  private val maxTargetVersion = 21
+  private val maxTargetVersion = 22
 
   def supportedTargetVersions: List[String] =
     (minTargetVersion to maxTargetVersion).toList.map(_.toString)

diff --git a/project/Build.scala b/project/Build.scala
@@ -577,7 +577,7 @@ object Build {
 
       // get libraries onboard
       libraryDependencies ++= Seq(
-        "org.scala-lang.modules" % "scala-asm" % "9.5.0-scala-1", // used by the backend
+        "org.scala-lang.modules" % "scala-asm" % "9.6.0-scala-1", // used by the backend
         Dependencies.compilerInterface,
         "org.jline" % "jline-reader" % "3.19.0",   // used by the REPL
         "org.jline" % "jline-terminal" % "3.19.0",

diff --git a/tests/pos-with-compiler-cc/backend/jvm/BCodeIdiomatic.scala b/tests/pos-with-compiler-cc/backend/jvm/BCodeIdiomatic.scala
@@ -55,7 +55,8 @@ trait BCodeIdiomatic extends caps.Pure {
     case "18" => asm.Opcodes.V18
     case "19" => asm.Opcodes.V19
     case "20" => asm.Opcodes.V20
-    case "21" => asm.Opcodes.V21*/
+    case "21" => asm.Opcodes.V21
+    case "22" => asm.Opcodes.V22*/
   }
 
   lazy val majorVersion: Int = (classfileVersion & 0xFF)

diff --git a/tests/pos-with-compiler-cc/dotc/config/ScalaSettings.scala b/tests/pos-with-compiler-cc/dotc/config/ScalaSettings.scala
@@ -17,7 +17,7 @@ class ScalaSettings extends SettingGroup with AllScalaSettings
 object ScalaSettings:
   // Keep synchronized with `classfileVersion` in `BCodeIdiomatic`
   private val minTargetVersion = 8
-  private val maxTargetVersion = 21
+  private val maxTargetVersion = 22
 
   def supportedTargetVersions: List[String] =
     (minTargetVersion to maxTargetVersion).toList.map(_.toString)