Skip to content

Commit 3edb4a7

Browse files
Backport "Update asm to 9.6" to LTS (#20721)
Backports #18712 to the LTS branch. PR submitted by the release tooling. [skip ci]
2 parents 9f11d0d + 2046d25 commit 3edb4a7

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

compiler/src/dotty/tools/backend/jvm/BackendUtils.scala

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class BackendUtils(val postProcessor: PostProcessor) {
3636
case "19" => asm.Opcodes.V19
3737
case "20" => asm.Opcodes.V20
3838
case "21" => asm.Opcodes.V21
39+
case "22" => asm.Opcodes.V22
3940
}
4041

4142
lazy val extraProc: Int = {

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ScalaSettings extends SettingGroup with AllScalaSettings
1818
object ScalaSettings:
1919
// Keep synchronized with `classfileVersion` in `BackendUtils`
2020
private val minTargetVersion = 8
21-
private val maxTargetVersion = 21
21+
private val maxTargetVersion = 22
2222

2323
def supportedTargetVersions: List[String] =
2424
(minTargetVersion to maxTargetVersion).toList.map(_.toString)

project/Build.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ object Build {
577577

578578
// get libraries onboard
579579
libraryDependencies ++= Seq(
580-
"org.scala-lang.modules" % "scala-asm" % "9.5.0-scala-1", // used by the backend
580+
"org.scala-lang.modules" % "scala-asm" % "9.6.0-scala-1", // used by the backend
581581
Dependencies.compilerInterface,
582582
"org.jline" % "jline-reader" % "3.19.0", // used by the REPL
583583
"org.jline" % "jline-terminal" % "3.19.0",

tests/pos-with-compiler-cc/backend/jvm/BCodeIdiomatic.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ trait BCodeIdiomatic extends caps.Pure {
5555
case "18" => asm.Opcodes.V18
5656
case "19" => asm.Opcodes.V19
5757
case "20" => asm.Opcodes.V20
58-
case "21" => asm.Opcodes.V21*/
58+
case "21" => asm.Opcodes.V21
59+
case "22" => asm.Opcodes.V22*/
5960
}
6061

6162
lazy val majorVersion: Int = (classfileVersion & 0xFF)

tests/pos-with-compiler-cc/dotc/config/ScalaSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ScalaSettings extends SettingGroup with AllScalaSettings
1717
object ScalaSettings:
1818
// Keep synchronized with `classfileVersion` in `BCodeIdiomatic`
1919
private val minTargetVersion = 8
20-
private val maxTargetVersion = 21
20+
private val maxTargetVersion = 22
2121

2222
def supportedTargetVersions: List[String] =
2323
(minTargetVersion to maxTargetVersion).toList.map(_.toString)

0 commit comments

Comments
 (0)