diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 80312a36403..55e19db062b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -499,10 +499,11 @@ public abstract class MemberCodegen resolvedCall, final int indexInPropertyMetadataArray, int propertyMetadataArgumentIndex, - @Nullable StackValue receiver + @Nullable StackValue receiver, + @NotNull PropertyDescriptor propertyDescriptor ) { - final Type owner = getDelegatedPropertyMetadataOwner(codegen, typeMapper); + final Type owner = JvmAbi.isPropertyWithBackingFieldInOuterClass(propertyDescriptor) ? + codegen.getState().getTypeMapper().mapOwner(propertyDescriptor) : + getDelegatedPropertyMetadataOwner(codegen, typeMapper); codegen.tempVariables.put( resolvedCall.getCall().getValueArguments().get(propertyMetadataArgumentIndex).asElement(), diff --git a/compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt16441.kt b/compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt16441.kt new file mode 100644 index 00000000000..1e93734c254 --- /dev/null +++ b/compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt16441.kt @@ -0,0 +1,16 @@ +import kotlin.reflect.KProperty + +class Delegate { + operator fun provideDelegate(thisRef: Any?, property: KProperty<*>) = this + operator fun getValue(thisRef: Any?, property: KProperty<*>) = "OK" +} + +class TestClass { + companion object { + val test by Delegate() + } +} + +fun box(): String { + return TestClass.test +} \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt b/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt index 72c49284d3d..23c02e69831 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/onProperties.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private @AnnField field p: int private final @AnnDelegate @org.jetbrains.annotations.NotNull field s$delegate: CustomDelegate private final @AnnField field x: int diff --git a/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt b/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt index 412dca4663f..583d16a9620 100644 --- a/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt +++ b/compiler/testData/codegen/light-analysis/annotations/delegatedPropertySetter.txt @@ -17,7 +17,7 @@ public annotation class First @kotlin.Metadata public final class MyClass { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field x$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt b/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt index 60183ab2c1f..ac290eab5cd 100644 --- a/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt +++ b/compiler/testData/codegen/light-analysis/annotations/jvmAnnotationFlags.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class C { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @kotlin.jvm.Transient @org.jetbrains.annotations.NotNull field del$delegate: CustomDelegate private final @kotlin.jvm.Transient field tra: int private volatile @kotlin.jvm.Volatile field vol: int diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt b/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt index 3a61ca916ec..f6aee5c8434 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field two$delegate: NumberDecrypter public method (): void public final method getTwo(): int @@ -8,7 +8,7 @@ public final class A { @kotlin.Metadata public final class DelegatedKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field four$delegate: NumberDecrypter public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getFour(): int diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt b/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt index c9c6d3307a5..0a1c5e7c25d 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/delegatedMutable.txt @@ -11,7 +11,7 @@ public final class Delegate { @kotlin.Metadata public final class DelegatedMutableKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt b/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt index 0d72effc6f2..544021d7bf5 100644 --- a/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt +++ b/compiler/testData/codegen/light-analysis/callableReference/property/genericProperty.txt @@ -8,7 +8,7 @@ public final class DVal { @kotlin.Metadata public final class GenericPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.Nullable field additionalText$delegate: DVal private final static field additionalValue$delegate: DVal public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt index bcd301ab9d9..42332ecfd38 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class AccessTopLevelDelegatedPropertyInClinitKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field a: java.lang.String private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt index 1e8f3369f67..446d6dfc9a3 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/capturePropertyInClosure.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class B { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final field value$delegate: Delegate public method (): void private final method getValue(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt index 16a4555c9ca..1a1f15bbcc7 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/castGetReturnType.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class AImpl { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.Number diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt index d0bd9886a29..a251ba6359a 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/castSetParameter.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getProp(): Derived diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt index 76ef0fe0ab3..063aad25ee8 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateAsInnerClass.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: A.Delegate inner class A/Delegate public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt index 9e7ce6e4473..c8e86dbf291 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByOtherProperty.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field p: Delegate private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt index e979aee3403..3db5f5acb65 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelFun.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt index 55a594a1a64..15c090126ce 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateByTopLevelProperty.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt index 5656d99ee92..d1601d38141 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtProperty.txt @@ -11,7 +11,7 @@ public final class Delegate { @kotlin.Metadata public final class DelegateForExtPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getProp(@org.jetbrains.annotations.NotNull p0: A): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt index 7fac3d0ed2b..91cabca9e99 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateForExtPropertyInClass.txt @@ -11,7 +11,7 @@ public final class DelegateForExtPropertyInClassKt { @kotlin.Metadata public final class F { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate inner class F/A public method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt index 4163a6ef6a3..16e35c0c040 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/delegateWithPrivateSet.txt @@ -5,7 +5,7 @@ public final class DelegateWithPrivateSetKt { @kotlin.Metadata public final class My { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field delegate$delegate: kotlin.properties.ReadWriteProperty public method (): void public final @org.jetbrains.annotations.NotNull method getDelegate(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt index 3b0298fe55f..6ae1d699558 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionDelegatesWithSameNames.txt @@ -13,7 +13,7 @@ public final class D { @kotlin.Metadata public final class ExtensionDelegatesWithSameNamesKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate$1: D private final static @org.jetbrains.annotations.NotNull field prop$delegate: D public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt index 0501f281e49..a0bda4b9876 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/extensionPropertyAndExtensionGetValue.txt @@ -14,7 +14,7 @@ public final class B { @kotlin.Metadata public final class ExtensionPropertyAndExtensionGetValueKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: A public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: B): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt index d107bbb8765..eaf670297ea 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/genericDelegate.txt @@ -6,7 +6,7 @@ public final class A { @kotlin.Metadata public final class A/B { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate synthetic final field this$0: A inner class A/B diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt index becbf20408e..996b630d260 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFun.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt index 0f411520a22..59683ddcdbb 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/getAsExtensionFunInClass.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/getDelegateWithoutReflection.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/getDelegateWithoutReflection.txt index 2a7a226f333..00870233dc1 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/getDelegateWithoutReflection.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/getDelegateWithoutReflection.txt @@ -7,7 +7,7 @@ public final class Delegate { @kotlin.Metadata public final class GetDelegateWithoutReflectionKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field foo$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getFoo(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt index b0366ae32b5..a5f25d95803 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVal.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt index 66fe616bedd..3d61a17a21c 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inClassVar.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt index 42820d379dc..409aa3cf36d 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inTrait.txt @@ -5,7 +5,7 @@ public interface A { @kotlin.Metadata public final class AImpl { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt index 788a87e20e9..ba37aedda3b 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/inferredPropertyType.txt @@ -6,7 +6,7 @@ public final class A { @kotlin.Metadata public final class A/B { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate synthetic final field this$0: A inner class A/B diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt index 885fe84900e..8e760381d3a 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/kt4138.txt @@ -21,7 +21,7 @@ public final class Foo { @kotlin.Metadata public final static class Foo/Companion { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] inner class Foo/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getA(): Foo @@ -37,7 +37,7 @@ public interface FooTrait { @kotlin.Metadata public final static class FooTrait/Companion { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field A$delegate: Delegate private final static @org.jetbrains.annotations.NotNull field B$delegate: Delegate inner class FooTrait/Companion diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt index 4602e213a0d..b5198a24b91 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/kt9712.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field K$delegate: kotlin.properties.ReadWriteProperty public method (): void public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String @@ -19,7 +19,7 @@ public final class Kt9712Kt { @kotlin.Metadata public final class X { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: X private final static @org.jetbrains.annotations.NotNull field O$delegate: kotlin.properties.ReadWriteProperty private method (): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt index ad201980f54..5db7a3f130a 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/privateSetterKPropertyIsNotMutable.txt @@ -8,7 +8,7 @@ public final class Delegate { @kotlin.Metadata public final class My { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field delegate$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getDelegate(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt index 6830349b023..a202a12daf8 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/privateVar.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final field prop$delegate: Delegate public method (): void private final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt index 8eee7869e04..f3acc6fd7b3 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/propertyMetadataShouldBeCached.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field Companion: A.Companion private final static @org.jetbrains.annotations.Nullable field bar$delegate: AnyHandler private final @org.jetbrains.annotations.NotNull field foo$delegate: IntHandler @@ -12,7 +12,7 @@ public final class A { @kotlin.Metadata public final static class A/Companion { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] inner class A/Companion private method (): void public final @org.jetbrains.annotations.Nullable method getBar(): java.lang.Object @@ -37,7 +37,7 @@ public final class IntHandler { @kotlin.Metadata public final class PropertyMetadataShouldBeCachedKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field baz$delegate: StringHandler private final static @org.jetbrains.annotations.NotNull field metadatas: java.util.IdentityHashMap public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt index bd1a5d4992d..7ed38090997 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/protectedVarWithPrivateSet.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field value$delegate: kotlin.properties.ReadWriteProperty public method (): void protected final @org.jetbrains.annotations.NotNull method getValue(): java.lang.Object diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt index 82f9e34ba57..56c2a4e13a6 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/differentReceivers.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class DifferentReceiversKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private static @org.jetbrains.annotations.NotNull field log: java.lang.String private final static @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String private final static @org.jetbrains.annotations.NotNull field testO$delegate: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrder.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrder.txt index 3f0f06e614e..fb38675105e 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrder.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrder.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class EvaluationOrderKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private static @org.jetbrains.annotations.NotNull field log: java.lang.String private final static @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String private final static @org.jetbrains.annotations.NotNull field testO$delegate: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt index 552f21aaf19..27c908c0fbd 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/evaluationOrderVar.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class EvaluationOrderVarKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field dispatcher: java.util.HashMap private static @org.jetbrains.annotations.NotNull field log: java.lang.String private final static @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt index 6398e4ebb0a..fe8904a8b44 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/extensionDelegated.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class ExtensionDelegatedKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field calc$delegate: UserDataProperty private static @org.jetbrains.annotations.NotNull field log: java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt index ab0fb5dedec..1951c179ee7 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/generic.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class GenericKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private static @org.jetbrains.annotations.NotNull field log: java.lang.String private final static @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String private final static @org.jetbrains.annotations.NotNull field testO$delegate: MyClass diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/hostCheck.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/hostCheck.txt index b6d2c81a9c5..35e8c48d471 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/hostCheck.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/hostCheck.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field result$delegate: Delegate private final @org.jetbrains.annotations.NotNull field value: java.lang.String public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt index f403e705924..864d81f6f6f 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inClass.txt @@ -11,7 +11,7 @@ public final class InClassKt { @kotlin.Metadata public final class Test { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String private final @org.jetbrains.annotations.NotNull field testO$delegate: java.lang.String private final @org.jetbrains.annotations.NotNull field testOK: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt index b9123403812..b6078ae9dad 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/inlineProvideDelegate.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class InlineProvideDelegateKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private static @org.jetbrains.annotations.NotNull field log: java.lang.String private final static @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String private final static @org.jetbrains.annotations.NotNull field testO$delegate: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt index c0acdf225bc..efbc4c3741f 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/jvmStaticInObject.txt @@ -11,7 +11,7 @@ public final class JvmStaticInObjectKt { @kotlin.Metadata public final class Test { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: Test private final static @org.jetbrains.annotations.NotNull field testK$delegate: java.lang.String private final static @org.jetbrains.annotations.NotNull field testO$delegate: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/kt15437.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/kt15437.txt index 3a93787688b..bffeb618064 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/kt15437.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/kt15437.txt @@ -7,7 +7,7 @@ public final class Delegate { @kotlin.Metadata public final class Kt15437Kt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/kt16441.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/kt16441.txt new file mode 100644 index 00000000000..19e7cdde730 --- /dev/null +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/kt16441.txt @@ -0,0 +1,27 @@ +@kotlin.Metadata +public final class Delegate { + public method (): void + public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): java.lang.String + public final @org.jetbrains.annotations.NotNull method provideDelegate(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): Delegate +} + +@kotlin.Metadata +public final class Kt16441Kt { + public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String +} + +@kotlin.Metadata +public final class TestClass { + public final static field Companion: TestClass.Companion + private final static @org.jetbrains.annotations.NotNull field test$delegate: Delegate + inner class TestClass/Companion + public method (): void +} + +@kotlin.Metadata +public final static class TestClass/Companion { + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + inner class TestClass/Companion + private method (): void + public final @org.jetbrains.annotations.NotNull method getTest(): java.lang.String +} diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt index 8b570ed7f86..155703617d9 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/memberExtension.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class Host { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: Host private final static @org.jetbrains.annotations.NotNull field ok: java.lang.String private final static @org.jetbrains.annotations.NotNull field plusK$delegate: Host.StringDelegate diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt index 0d8f127d423..04b90b845eb 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/provideDelegate/propertyMetadata.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class PropertyMetadataKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field K$delegate: java.lang.String private final static @org.jetbrains.annotations.NotNull field O$delegate: java.lang.String private final static @org.jetbrains.annotations.NotNull field OK: java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt index dee35fd88d5..bdb9a028d2b 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFun.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt index 075480f090c..4adc83d2c48 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/setAsExtensionFunInClass.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (): void public final method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt index 6addf1707e1..683e552bc3b 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/stackOverflowOnCallFromGetValue.txt @@ -8,7 +8,7 @@ public final class Delegate { @kotlin.Metadata public final class O { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: O private final static @org.jetbrains.annotations.NotNull field memExt$delegate: Delegate private final static @org.jetbrains.annotations.NotNull field member$delegate: Delegate @@ -21,7 +21,7 @@ public final class O { @kotlin.Metadata public final class StackOverflowOnCallFromGetValueKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field topLevel$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method check(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt index ee7fca534a2..25af447bab2 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVal.txt @@ -6,7 +6,7 @@ public final class Delegate { @kotlin.Metadata public final class TopLevelValKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt index e5ede7b5f34..f3ad2c2ee06 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/topLevelVar.txt @@ -10,7 +10,7 @@ public final class Delegate { @kotlin.Metadata public final class TopLevelVarKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getProp(): int diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt index 57f2a7405d8..1c7c8ca96aa 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/twoPropByOneDelegete.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final field i: int private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public method (p0: int): void diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt index 143fa636594..1cd55d2553b 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/useKPropertyLater.txt @@ -8,7 +8,7 @@ public final class Delegate { @kotlin.Metadata public final class O { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: O private final static @org.jetbrains.annotations.NotNull field memExt$delegate: Delegate private final static @org.jetbrains.annotations.NotNull field member$delegate: Delegate @@ -21,7 +21,7 @@ public final class O { @kotlin.Metadata public final class UseKPropertyLaterKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field properties: java.util.HashSet private final static @org.jetbrains.annotations.NotNull field topLevel$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt index ccc21f7d4ec..5136a31f8bc 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/useReflectionOnKProperty.txt @@ -6,7 +6,7 @@ public final class Delegate { @kotlin.Metadata public final class UseReflectionOnKPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field prop$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getProp(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt index 3c6637c244e..ab45d712bd3 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/valInInnerClass.txt @@ -6,7 +6,7 @@ public final class A { @kotlin.Metadata public final class A/B { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate synthetic final field this$0: A inner class A/B diff --git a/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt b/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt index fe91f3db940..afde7269b4f 100644 --- a/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt +++ b/compiler/testData/codegen/light-analysis/delegatedProperty/varInInnerClass.txt @@ -6,7 +6,7 @@ public final class A { @kotlin.Metadata public final class A/B { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field prop$delegate: Delegate synthetic final field this$0: A inner class A/B diff --git a/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt b/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt index cf9b89d9d10..9d7c5071385 100644 --- a/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt +++ b/compiler/testData/codegen/light-analysis/fieldRename/delegates.txt @@ -10,7 +10,7 @@ public final class B { @kotlin.Metadata public final class DelegatesKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field s$delegate$1: TestDelegate private final static @org.jetbrains.annotations.NotNull field s$delegate: TestDelegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt b/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt index 376169c53fe..f067eb4a902 100644 --- a/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt +++ b/compiler/testData/codegen/light-analysis/jvmName/propertyAccessorsUseSite.txt @@ -13,7 +13,7 @@ public final class PropertyAccessorsUseSiteKt { @kotlin.Metadata public final class TestIt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private field isFries: boolean private final @org.jetbrains.annotations.NotNull field isUpdateable$delegate: Delegate public method (): void diff --git a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt index 0768d2218dc..bf9e52c6473 100644 --- a/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt +++ b/compiler/testData/codegen/light-analysis/multifileClasses/optimized/delegatedVal.txt @@ -10,7 +10,7 @@ public final class a/MultifileClass { @kotlin.Metadata synthetic final class a/MultifileClass__Part1Kt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field OK$delegate: kotlin.Lazy public final static @org.jetbrains.annotations.NotNull method getOK(): java.lang.String } diff --git a/compiler/testData/codegen/light-analysis/properties/kt4383.txt b/compiler/testData/codegen/light-analysis/properties/kt4383.txt index a278b0b0ce4..5426691d0a9 100644 --- a/compiler/testData/codegen/light-analysis/properties/kt4383.txt +++ b/compiler/testData/codegen/light-analysis/properties/kt4383.txt @@ -11,7 +11,7 @@ public final class Kt4383Kt { @kotlin.Metadata public final class P { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field INSTANCE: P private final static @org.jetbrains.annotations.NotNull field u: kotlin.Unit private final static @org.jetbrains.annotations.NotNull field v$delegate: D diff --git a/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt b/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt index 4a6ee02728e..89c3cad9247 100644 --- a/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt +++ b/compiler/testData/codegen/light-analysis/properties/primitiveOverrideDelegateAccessor.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class A { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field value$delegate: Holder public method (p0: int): void public synthetic method getValue(): java.lang.Comparable diff --git a/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt b/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt index 1d5ae021f92..c798e057ea2 100644 --- a/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt +++ b/compiler/testData/codegen/light-analysis/reflection/enclosing/kt6368.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class Kt6368Kt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field a$delegate: kotlin.Lazy public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getA(): java.util.HashMap diff --git a/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt b/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt index 2323438664e..dad33bc2a2c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt +++ b/compiler/testData/codegen/light-analysis/reflection/genericSignature/genericBackingFieldSignature.txt @@ -10,7 +10,7 @@ public final class TParam { @kotlin.Metadata public final class Test { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.Nullable field classField1: Z private final @org.jetbrains.annotations.Nullable field classField2: Z private final @org.jetbrains.annotations.Nullable field classField3: Zout diff --git a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/delegatedProperty.txt b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/delegatedProperty.txt index 3e73c7e39c9..59d6f12b95c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/delegatedProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/noReflectAtRuntime/methodsFromAny/delegatedProperty.txt @@ -11,7 +11,7 @@ public final class Delegate { @kotlin.Metadata public final class DelegatedPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field x$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getX(): kotlin.Unit diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/booleanPropertyNameStartsWithIs.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/booleanPropertyNameStartsWithIs.txt index 1637fc82e6e..ac45d955602 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/booleanPropertyNameStartsWithIs.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/booleanPropertyNameStartsWithIs.txt @@ -12,7 +12,7 @@ public final class Delegate { @kotlin.Metadata public final class Foo { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field isOK$delegate: Delegate public method (): void public final method isOK(): boolean diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundExtensionProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundExtensionProperty.txt index cb05798ca8d..893ec40afed 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundExtensionProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundExtensionProperty.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class BoundExtensionPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getResult(@org.jetbrains.annotations.NotNull p0: Foo): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundMemberProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundMemberProperty.txt index cb5476385e2..43f6f3b1a7d 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundMemberProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/boundMemberProperty.txt @@ -16,7 +16,7 @@ public final class Delegate { @kotlin.Metadata public final class Foo { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field result$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/extensionProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/extensionProperty.txt index 54c8b4f5933..1f6911ff02a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/extensionProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/extensionProperty.txt @@ -11,7 +11,7 @@ public final class Delegate { @kotlin.Metadata public final class ExtensionPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getResult(@org.jetbrains.annotations.NotNull p0: Foo): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/fakeOverride.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/fakeOverride.txt index 4294e8d6283..55b1122524a 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/fakeOverride.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/fakeOverride.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public class Base { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field x$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/getExtensionDelegate.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/getExtensionDelegate.txt index a406eef4d70..681ff0ea4a0 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/getExtensionDelegate.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/getExtensionDelegate.txt @@ -7,7 +7,7 @@ public final class Delegate { @kotlin.Metadata public final class Foo { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field member$delegate: Delegate private final @org.jetbrains.annotations.NotNull field memberExtension$delegate: Delegate public method (): void @@ -17,7 +17,7 @@ public final class Foo { @kotlin.Metadata public final class GetExtensionDelegateKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field extension$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method getExtension(@org.jetbrains.annotations.NotNull p0: Foo): boolean diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/kPropertyForDelegatedProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/kPropertyForDelegatedProperty.txt index deb52c061a9..7c0b8e94f78 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/kPropertyForDelegatedProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/kPropertyForDelegatedProperty.txt @@ -11,7 +11,7 @@ public final class Delegate { @kotlin.Metadata public final class KPropertyForDelegatedPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private static @org.jetbrains.annotations.Nullable field ref: kotlin.reflect.KProperty private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberExtensionProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberExtensionProperty.txt index 13c55fed2a0..381b703bb7c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberExtensionProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberExtensionProperty.txt @@ -16,7 +16,7 @@ public final class Delegate { @kotlin.Metadata public final class Foo { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field result$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getResult(@org.jetbrains.annotations.NotNull p0: Bar): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberProperty.txt index a3ac02194d4..2ac1eef14fd 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/memberProperty.txt @@ -11,7 +11,7 @@ public final class Delegate { @kotlin.Metadata public final class Foo { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field result$delegate: Delegate public method (): void public final @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashClassAndCompanion.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashClassAndCompanion.txt index 4567dc1b089..15872c3688f 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashClassAndCompanion.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashClassAndCompanion.txt @@ -8,7 +8,7 @@ public final class Delegate { @kotlin.Metadata public final class Foo { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] public final static field Companion: Foo.Companion private final @org.jetbrains.annotations.NotNull field x$delegate$1: Delegate private final static @org.jetbrains.annotations.NotNull field x$delegate: Delegate @@ -19,7 +19,7 @@ public final class Foo { @kotlin.Metadata public final static class Foo/Companion { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] inner class Foo/Companion private method (): void public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashExtensionProperties.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashExtensionProperties.txt index 79ec3d72b10..33d5080b136 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashExtensionProperties.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/nameClashExtensionProperties.txt @@ -13,7 +13,7 @@ public final class Foo { @kotlin.Metadata public final class MemberExtensions { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field bar$delegate$1: Delegate private final @org.jetbrains.annotations.NotNull field bar$delegate$2: Delegate private final @org.jetbrains.annotations.NotNull field bar$delegate: Delegate @@ -25,7 +25,7 @@ public final class MemberExtensions { @kotlin.Metadata public final class NameClashExtensionPropertiesKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field bar$delegate$1: Delegate private final static @org.jetbrains.annotations.NotNull field bar$delegate$2: Delegate private final static @org.jetbrains.annotations.NotNull field bar$delegate: Delegate diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/noSetAccessibleTrue.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/noSetAccessibleTrue.txt index ae2c1a828ca..89986989f6c 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/noSetAccessibleTrue.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/noSetAccessibleTrue.txt @@ -7,7 +7,7 @@ public final class Delegate { @kotlin.Metadata public final class Foo { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field member$delegate: Delegate private final @org.jetbrains.annotations.NotNull field memberExtension$delegate: Delegate public method (): void @@ -17,7 +17,7 @@ public final class Foo { @kotlin.Metadata public final class NoSetAccessibleTrueKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field extension$delegate: Delegate private final static @org.jetbrains.annotations.NotNull field topLevel$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/overrideDelegatedByDelegated.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/overrideDelegatedByDelegated.txt index 3681090cee5..4109b3d7aa4 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/overrideDelegatedByDelegated.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/overrideDelegatedByDelegated.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public class Base { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field x$delegate: Delegate public method (): void public @org.jetbrains.annotations.NotNull method getX(): java.lang.String @@ -16,7 +16,7 @@ public final class Delegate { @kotlin.Metadata public final class Derived { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field x$delegate: Delegate public method (): void public @org.jetbrains.annotations.NotNull method getX(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/topLevelProperty.txt b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/topLevelProperty.txt index 08f4897217c..950bc77bd64 100644 --- a/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/topLevelProperty.txt +++ b/compiler/testData/codegen/light-analysis/reflection/properties/getDelegate/topLevelProperty.txt @@ -11,7 +11,7 @@ public final class Delegate { @kotlin.Metadata public final class TopLevelPropertyKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/codegen/light-analysis/reified/DIExample.txt b/compiler/testData/codegen/light-analysis/reified/DIExample.txt index 523cdae7eae..1e84625c3c5 100644 --- a/compiler/testData/codegen/light-analysis/reified/DIExample.txt +++ b/compiler/testData/codegen/light-analysis/reified/DIExample.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class DIExampleKt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.NotNull field project: Project private final static @org.jetbrains.annotations.NotNull field x1$delegate: Project private final static @org.jetbrains.annotations.NotNull field x2$delegate: Project diff --git a/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt b/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt index 1b99f5c7c11..7420c586d79 100644 --- a/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt +++ b/compiler/testData/codegen/light-analysis/typeMapping/kt3863.txt @@ -13,7 +13,7 @@ public final class NotImplemented { @kotlin.Metadata public final class Test { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final @org.jetbrains.annotations.NotNull field x$delegate: NotImplemented public method (): void public final method getX(): int diff --git a/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt b/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt index be4681b2e7f..29aa20881e4 100644 --- a/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt +++ b/compiler/testData/codegen/light-analysis/typeMapping/kt3976.txt @@ -1,6 +1,6 @@ @kotlin.Metadata public final class Kt3976Kt { - private synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] private final static @org.jetbrains.annotations.Nullable field currentAccountId$delegate: SessionAccessor public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.Nullable method getCurrentAccountId(): java.lang.Integer diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 6c398ba09cd..038acb4bea4 100644 --- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -6589,6 +6589,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes doTest(fileName); } + @TestMetadata("kt16441.kt") + public void testKt16441() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt16441.kt"); + doTest(fileName); + } + @TestMetadata("local.kt") public void testLocal() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/provideDelegate/local.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 66ae76a9a29..03d3ab26acc 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -6589,6 +6589,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("kt16441.kt") + public void testKt16441() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt16441.kt"); + doTest(fileName); + } + @TestMetadata("local.kt") public void testLocal() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/provideDelegate/local.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index 51f7ccad211..2bed4a68078 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -7442,6 +7442,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { doTest(fileName); } + @TestMetadata("kt16441.kt") + public void testKt16441() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt16441.kt"); + doTest(fileName); + } + @TestMetadata("local.kt") public void testLocal() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/provideDelegate/local.kt");