Regenerate inline class tests as 1 arg value classes
This commit is contained in:
committed by
Space
parent
5ac4722be4
commit
ec2e96f3e4
+5
-6
@@ -1,11 +1,12 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
var setterInvoked = 0
|
||||
|
||||
var backing = 42
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class DelegateStr(val ignored: String) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
@@ -17,8 +18,7 @@ value class DelegateStr(val ignored: String) {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class DelegateInt(val ignored: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
@@ -30,8 +30,7 @@ value class DelegateInt(val ignored: Int) {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class DelegateLong(val ignored: Long) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
|
||||
Vendored
+3
-2
@@ -1,4 +1,6 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
class Foo {
|
||||
var a: Int = 42
|
||||
@@ -7,8 +9,7 @@ class Foo {
|
||||
|
||||
var setterInvoked = 0
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val default: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
|
||||
+4
-4
@@ -1,4 +1,6 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
class Foo {
|
||||
var a: Int = 42
|
||||
@@ -8,8 +10,7 @@ class Foo {
|
||||
var provideDelegateInvoked = 0
|
||||
var setterInvoked = 0
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class DelegateFactory(val default: Int) {
|
||||
operator fun provideDelegate(thisRef: Any?, prop: Any?): Delegate {
|
||||
provideDelegateInvoked++
|
||||
@@ -17,8 +18,7 @@ value class DelegateFactory(val default: Int) {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val default: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
|
||||
Vendored
+3
-2
@@ -1,4 +1,6 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
class Foo {
|
||||
companion object {
|
||||
@@ -9,8 +11,7 @@ class Foo {
|
||||
|
||||
var setterInvoked = 0
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val ignored: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) = Foo.a
|
||||
|
||||
+3
-2
@@ -1,5 +1,7 @@
|
||||
// TARGET_BACKEND: JVM
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
class Foo {
|
||||
companion object {
|
||||
@@ -10,8 +12,7 @@ class Foo {
|
||||
|
||||
var setterInvoked = 0
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val ignored: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) = Foo.a
|
||||
|
||||
Vendored
+5
-6
@@ -1,11 +1,12 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
var setterInvoked = 0
|
||||
|
||||
var backing = 42
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class DelegateStr(val ignored: String) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
@@ -17,8 +18,7 @@ value class DelegateStr(val ignored: String) {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class DelegateInt(val ignored: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
@@ -30,8 +30,7 @@ value class DelegateInt(val ignored: Int) {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class DelegateLong(val ignored: Long) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
|
||||
Vendored
+3
-2
@@ -1,4 +1,6 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
object Foo {
|
||||
var a: Int = 42
|
||||
@@ -7,8 +9,7 @@ object Foo {
|
||||
|
||||
var setterInvoked = 0
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val ignored: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) = Foo.a
|
||||
|
||||
+3
-2
@@ -1,4 +1,6 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
class Foo {
|
||||
companion object {
|
||||
@@ -12,8 +14,7 @@ class Foo {
|
||||
|
||||
var setterInvoked = 0
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val ignored: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) = Foo.a
|
||||
|
||||
Vendored
+3
-2
@@ -1,10 +1,11 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
var setterInvoked = 0
|
||||
var backing = 42
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val ignored: Int) {
|
||||
|
||||
operator fun getValue(thisRef: Any?, prop: Any?) =
|
||||
|
||||
compiler/testData/codegen/box/inlineClasses/propertyDelegation/delegatedPropertyOfInlineClassType.kt
Vendored
+7
-6
@@ -1,15 +1,16 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
import kotlin.reflect.KProperty
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class ICInt(val i: Int)
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class ICLong(val l: Long)
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class ICOverIC(val o: ICLong)
|
||||
|
||||
class Delegate<T>(var f: () -> T) {
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
import kotlin.properties.ReadOnlyProperty
|
||||
import kotlin.reflect.KProperty
|
||||
@@ -8,8 +10,7 @@ class Foo {
|
||||
val b by Delegate(0)
|
||||
}
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Delegate(val ignored: Int): ReadOnlyProperty<Foo, Int> {
|
||||
override fun getValue(thisRef: Foo, property: KProperty<*>): Int {
|
||||
return thisRef.a
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
// WITH_STDLIB
|
||||
// WORKS_WHEN_VALUE_CLASS
|
||||
// LANGUAGE: +ValueClasses
|
||||
|
||||
class Delegate {
|
||||
operator fun getValue(t: Any?, p: Any): String = "OK"
|
||||
}
|
||||
|
||||
@Suppress("OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE")
|
||||
@kotlin.jvm.JvmInline
|
||||
OPTIONAL_JVM_INLINE_ANNOTATION
|
||||
value class Kla1(val default: Int) {
|
||||
fun getValue(): String {
|
||||
val prop by Delegate()
|
||||
|
||||
Reference in New Issue
Block a user