Skip to content

Commit ee706b8

Browse files
committed
Support writing classfile of version 52
1 parent 0ccdb15 commit ee706b8

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ abstract class BCodeIdiomatic extends SubComponent {
3434
case "jvm-1.5" => asm.Opcodes.V1_5
3535
case "jvm-1.6" => asm.Opcodes.V1_6
3636
case "jvm-1.7" => asm.Opcodes.V1_7
37+
case "jvm-1.8" => asm.Opcodes.V1_8
3738
}
3839

3940
val majorVersion: Int = (classfileVersion & 0xFF)

src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters with GenJVMASM {
381381
case "jvm-1.5" => asm.Opcodes.V1_5
382382
case "jvm-1.6" => asm.Opcodes.V1_6
383383
case "jvm-1.7" => asm.Opcodes.V1_7
384+
case "jvm-1.8" => asm.Opcodes.V1_8
384385
}
385386

386387
private val majorVersion: Int = (classfileVersion & 0xFF)

src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ trait StandardScalaSettings {
3939
val optimise: BooleanSetting // depends on post hook which mutates other settings
4040
val print = BooleanSetting ("-print", "Print program with Scala-specific features removed.")
4141
val target = ChoiceSetting ("-target", "target", "Target platform for object files. All JVM 1.5 targets are deprecated.",
42-
List("jvm-1.5", "jvm-1.6", "jvm-1.7"), "jvm-1.6")
42+
List("jvm-1.5", "jvm-1.6", "jvm-1.7", "jvm-1.8"), "jvm-1.6")
4343
val unchecked = BooleanSetting ("-unchecked", "Enable additional warnings where generated code depends on assumptions.")
4444
val uniqid = BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.")
4545
val usejavacp = BooleanSetting ("-usejavacp", "Utilize the java.class.path in classpath resolution.")

0 commit comments

Comments
 (0)