Migrate all JDK 9 related tests to JDK 11

This commit is contained in:
Dmitriy Novozhilov
2021-09-22 17:21:53 +03:00
committed by TeamCityServer
parent ce3562f0e8
commit de7fb9606a
92 changed files with 284 additions and 306 deletions
@@ -1,4 +1,4 @@
// JVM_TARGET: 9
// JVM_TARGET: 11
class A
inline class IC(val x: String)
@@ -42,4 +42,4 @@ fun box(a: String, b: String?, x: IC?) {
// .. but ir backend performs wise `toString-impl` call
// one in IC.toString() + one in concatenation
// 2 INVOKESTATIC IC.toString-impl
// 2 INVOKESTATIC IC.toString-impl
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants
// JVM_TARGET: 9
// JVM_TARGET: 11
fun box() {
val z = "0"
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants
// JVM_TARGET: 9
// JVM_TARGET: 11
fun box() {
val z = "0"
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants
// JVM_TARGET: 9
// JVM_TARGET: 11
fun box() {
val z = "0"
val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
@@ -16,4 +16,4 @@ fun box() {
}
// 2 INVOKEDYNAMIC makeConcatWithConstants
// 0 append
// 0 stringPlus
// 0 stringPlus
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants
// JVM_TARGET: 9
// JVM_TARGET: 11
class A
inline fun test(s: (String) -> Unit) {
@@ -12,4 +12,4 @@ fun box(a: String, b: String?) {
// 1 INVOKEDYNAMIC makeConcatWithConstants
// 0 append
// 0 stringPlus
// 0 stringPlus
@@ -1,7 +1,7 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants
// JVM_TARGET: 9
// JVM_TARGET: 11
data class A(val i: Int, val b: Byte, val c: Char, val s: Short, val f: Float, val d: Double, val bo: Boolean, val l: Long)
// 1 INVOKEDYNAMIC makeConcatWithConstants
// 1 INVOKEDYNAMIC makeConcatWithConstants\(IBCSFDZJ\)Ljava/lang/String;
// 1 "A\(i=\\u0001, b=\\u0001, c=\\u0001, s=\\u0001, f=\\u0001, d=\\u0001, bo=\\u0001, l=\\u0001\)"
// 1 "A\(i=\\u0001, b=\\u0001, c=\\u0001, s=\\u0001, f=\\u0001, d=\\u0001, bo=\\u0001, l=\\u0001\)"
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy
// JVM_TARGET: 9
// JVM_TARGET: 11
class A
inline fun test(s: (String) -> Unit) {
@@ -20,4 +20,4 @@ fun box(a: String, b: String?) {
// 0 INVOKEDYNAMIC makeConcatWithConstants
// 6 INVOKEDYNAMIC makeConcat
// 0 append
// 0 stringPlus
// 0 stringPlus
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy
// JVM_TARGET: 9
// JVM_TARGET: 11
fun box() {
val z = "0"
val result = z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z + z +
@@ -17,4 +17,4 @@ fun box() {
}
// 2 INVOKEDYNAMIC makeConcat
// 0 append
// 0 stringPlus
// 0 stringPlus
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy
// JVM_TARGET: 9
// JVM_TARGET: 11
data class A(val i: Int, val b: Byte, val c: Char, val s: Short, val f: Float, val d: Double, val bo: Boolean, val l: Long)
// 1 INVOKEDYNAMIC makeConcat
@@ -1,4 +1,4 @@
// JVM_TARGET: 9
// JVM_TARGET: 11
fun box(a: String, b: String?) {
val s = a + "\u0001" + 2.toChar() + 3.toChar() + 4L + b + 5.0 + 6F + '7' + b + "\u0002" + 1.toChar()
@@ -14,4 +14,4 @@ fun box(a: String, b: String?) {
// JVM_IR_TEMPLATES
// 1 "\\u0001\\u0002\\u00015.06.07\\u0001\\u0002"
// 1 "\\u0001\\u0002\\u00034"
// 1 "\\u0002\\u0001"
// 1 "\\u0002\\u0001"
@@ -1,4 +1,4 @@
// JVM_TARGET: 9
// JVM_TARGET: 11
data class A(val x: Unit)
fun test(): Unit {}
@@ -1,5 +1,5 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants
// JVM_TARGET: 9
// JVM_TARGET: 11
fun box(a: String, b: String?) {
val sb = StringBuilder();
sb.append("123")
@@ -7,4 +7,4 @@ fun box(a: String, b: String?) {
// 0 INVOKEDYNAMIC makeConcatWithConstants
// 1 append
// 0 stringPlus
// 0 stringPlus
@@ -1,6 +1,6 @@
// KOTLIN_CONFIGURATION_FLAGS: STRING_CONCAT=indy-with-constants
// IGNORE_JAVA_ERRORS
// JVM_TARGET: 9
// JVM_TARGET: 11
// FILE: JavaClass.java
public class JavaClass {