[Tests] Remove unnecessary usages of OPTIONAL_JVM_INLINE_ANNOTATION

Signed-off-by: Evgeniy.Zhelenskiy <Evgeniy.Zhelenskiy@jetbrains.com>

#KT-1179
This commit is contained in:
Evgeniy.Zhelenskiy
2022-11-29 04:48:43 +01:00
committed by Space Team
parent 50310d42e3
commit fa4a4e56f3
67 changed files with 269 additions and 326 deletions
@@ -1,7 +1,6 @@
// IGNORE_BACKEND_K2: JVM_IR
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses +ContextReceivers
// CHECK_BYTECODE_LISTING
// FIR_IDENTICAL
-1
View File
@@ -2,7 +2,6 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND: ANDROID, ANDROID_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +ValueClassesSecondaryConstructorWithBody
@JvmInline
@@ -2,7 +2,6 @@
// FIR_IDENTICAL
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
@JvmInline
@@ -1,7 +1,6 @@
// CHECK_BYTECODE_LISTING
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
@JvmInline
@@ -1,6 +1,5 @@
// !LANGUAGE: +ValueClasses
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
+8 -9
View File
@@ -1,28 +1,27 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// CHECK_BYTECODE_LISTING
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class F1(val x: Int)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class F2(val x: UInt)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class F3(val x: F1, val y: F2)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class F4(val x: Int)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class F5(val x: UInt)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class F6(val x: String)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class A(
val f1: F1,
val f2: F2,
@@ -35,7 +34,7 @@ value class A(
val f9: String,
)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class B(val a1: A, val a2: A) {
override fun toString(): String {
return "OverridenBToString(a1 = $a1, a2 = $a2)"
@@ -1,6 +1,5 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
@JvmInline
@@ -2,7 +2,6 @@
// WITH_STDLIB
// WITH_COROUTINES
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// FILE: caller.kt
@@ -1,12 +1,11 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
var counter = 0
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC(val x: Int, val y: Int) {
fun equals(other: MFVC): Boolean {
@@ -1,5 +1,4 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
@@ -7,14 +6,14 @@
import java.lang.AssertionError
import kotlin.math.abs
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC1(val x: Int, val y: Int) {
fun equals(other: MFVC1): Boolean {
return abs(x - other.x) < 2 && abs(y - other.y) < 2
}
}
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC2(val x: Int, val y: Int) {
override fun equals(other: Any?): Boolean {
if (other !is MFVC2) {
@@ -1,12 +1,11 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
import kotlin.math.abs
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC(val x: Double, val y: Int) {
fun equals(other: MFVC): Boolean {
return abs(x - other.x) < 0.1
@@ -1,5 +1,4 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
@@ -10,7 +9,7 @@ interface I {
fun equals(param: MFVC): Boolean
}
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC(val value: Int, val y: Int) : I {
override fun equals(param: MFVC): Boolean {
return abs(value - param.value) < 2
@@ -1,6 +1,5 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// CHECK_BYTECODE_LISTING
// FIR_IDENTICAL
@@ -1,10 +1,9 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class A(val value1: MyClass, val value2: MyClass) {
override fun hashCode() = 42
}
@@ -1,10 +1,9 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC1<T : Number>(val x: T, val other: Int) {
fun equals(x: Int, other: Int) = false
fun equals(other: MFVC1<*>) = true
@@ -12,19 +11,19 @@ value class MFVC1<T : Number>(val x: T, val other: Int) {
class Generic<T, R>(val x: T, val y: R)
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC2<T, R>(val value: Generic<T, R>, val other: Int) {
fun equals(value: MFVC1<Double>, other: Int) = false
fun equals(other: MFVC2<*, *>) = true
}
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC3<T>(val value: T, val other: Int) {
fun equals(value: Int, other: Int) = false
fun equals(other: MFVC3<*>) = true
}
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC4<T>(val value: T, val other: Int) {
fun equals(value: Any, other: Int) = false
fun equals(other: MFVC4<*>) = true
@@ -1,12 +1,11 @@
// WITH_STDLIB
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
// TARGET_BACKEND: JVM_IR
// CHECK_BYTECODE_LISTING
import kotlin.math.abs
OPTIONAL_JVM_INLINE_ANNOTATION
@JvmInline
value class MFVC(val x: Int, val y: Int) {
override fun equals(other: Any?): Boolean {
if (other !is MFVC) {
@@ -1,6 +1,5 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// CHECK_BYTECODE_LISTING
@@ -1,6 +1,5 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// CHECK_BYTECODE_LISTING
@@ -1,6 +1,5 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// LANGUAGE: +GenericInlineClassParameter
// CHECK_BYTECODE_LISTING
@@ -1,6 +1,5 @@
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
// CHECK_BYTECODE_LISTING
// FIR_IDENTICAL
@@ -2,7 +2,6 @@
// FIR_IDENTICAL
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
@JvmInline
+1 -2
View File
@@ -2,7 +2,6 @@
// FIR_IDENTICAL
// WITH_STDLIB
// TARGET_BACKEND: JVM_IR
// WORKS_WHEN_VALUE_CLASS
// LANGUAGE: +ValueClasses
@JvmInline
@@ -294,4 +293,4 @@ fun box(): String {
}
return "OK"
}
}