File tree 2 files changed +19
-2
lines changed
src/dotty/tools/backend/jvm
2 files changed +19
-2
lines changed Original file line number Diff line number Diff line change @@ -129,7 +129,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
129
129
// reverse all the effects of this transformation, which would be counter-productive.
130
130
131
131
132
- // TODO: enable once we change lazy val encoding
132
+ // TODO: enable once we change lazy val encoding (https://github.com/lampepfl/dotty/issues/7140)
133
133
//
134
134
// Lazy val encoding assumes bitmap fields are non-static
135
135
//
Original file line number Diff line number Diff line change @@ -8,7 +8,8 @@ object TestConfiguration {
8
8
9
9
val noCheckOptions = Array (
10
10
" -pagewidth" , " 120" ,
11
- " -color:never"
11
+ " -color:never" ,
12
+ " -target" , defaultTarget
12
13
)
13
14
14
15
val checkOptions = Array (
@@ -76,4 +77,20 @@ object TestConfiguration {
76
77
77
78
/** Enables explicit nulls */
78
79
val explicitNullsOptions = defaultOptions and " -Yexplicit-nulls"
80
+
81
+ /** Default target of the generated class files */
82
+ private def defaultTarget : String = {
83
+ val javaVersion : Int =
84
+ if (Properties .javaVersion.startsWith(" 1." )) {
85
+ Properties .javaVersion.substring(2 , 3 ).toInt
86
+ }
87
+ else {
88
+ val dot = Properties .javaVersion.indexOf(" ." )
89
+ assert(dot != - 1 , " unknown java version: " + Properties .javaVersion)
90
+ Properties .javaVersion.substring(0 , dot).toInt
91
+ }
92
+
93
+ if (javaVersion < 9 ) " jvm-1.8"
94
+ else " jvm-9"
95
+ }
79
96
}
You can’t perform that action at this time.
0 commit comments