Fix for KT-16441: NoSuchFieldError: $$delegatedProperties when delegating through provideDelegate in companion object

 #KT-16441 Fixed

Author: Mikhael Bogdanov

compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java

@@ -499,10 +499,11 @@ private void initializeProperty(@NotNull ExpressionCodegen codegen, @NotNull KtP
         int indexOfDelegatedProperty = PropertyCodegen.indexOfDelegatedProperty(property);
 
         StackValue delegateValue = PropertyCodegen.invokeDelegatedPropertyConventionMethodWithReceiver(
-                codegen, typeMapper, provideDelegateResolvedCall, indexOfDelegatedProperty, 1, provideDelegateReceiver);
+                codegen, typeMapper, provideDelegateResolvedCall, indexOfDelegatedProperty, 1,
+                provideDelegateReceiver, propertyDescriptor
+        );
 
         propValue.store(delegateValue, codegen.v);
-
     }
 
     protected boolean shouldInitializeProperty(@NotNull KtProperty property) {
@@ -590,7 +591,7 @@ protected void generatePropertyMetadataArrayFieldIfNeeded(@NotNull Type thisAsmT
         }
         if (delegatedProperties.isEmpty()) return;
 
-        v.newField(NO_ORIGIN, ACC_PRIVATE | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME,
+        v.newField(NO_ORIGIN, ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME,
                    "[" + K_PROPERTY_TYPE, null, null);
 
         if (!state.getClassBuilderMode().generateBodies) return;

compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java

@@ -57,6 +57,7 @@
 
 import static org.jetbrains.kotlin.codegen.AsmUtil.getDeprecatedAccessFlag;
 import static org.jetbrains.kotlin.codegen.AsmUtil.getVisibilityForBackingField;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isPropertyWithBackingFieldCopyInOuterClass;
 import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConstOrHasJvmFieldAnnotation;
 import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface;
 import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.FIELD_FOR_PROPERTY;
@@ -534,7 +535,7 @@ public static StackValue invokeDelegatedPropertyConventionMethod(
         StackValue.Property receiver = codegen.intermediateValueForProperty(propertyDescriptor, true, null, StackValue.LOCAL_0);
         return invokeDelegatedPropertyConventionMethodWithReceiver(
                 codegen, typeMapper, resolvedCall, indexInPropertyMetadataArray, propertyMetadataArgumentIndex,
-                receiver
+                receiver, propertyDescriptor
         );
     }
 
@@ -544,9 +545,12 @@ public static StackValue invokeDelegatedPropertyConventionMethodWithReceiver(
             @NotNull ResolvedCall<FunctionDescriptor> 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(),

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
+}

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

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 <init>(): void
     public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String

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

compiler/testData/codegen/light-analysis/callableReference/property/delegated.txt

@@ -1,14 +1,14 @@
 @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 <init>(): void
     public final method getTwo(): int
 }
 
 @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

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

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

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

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 <init>(): void
     private final method getValue(): int

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 <init>(): void
     public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.Number

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 <init>(): void
     public final @org.jetbrains.annotations.NotNull method getProp(): Derived

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 <init>(): void

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 <init>(): void

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 <init>(): void
     public final method getProp(): int

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 <init>(): void
     public final method getProp(): int

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

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 <init>(): void

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 <init>(): void
     public final @org.jetbrains.annotations.NotNull method getDelegate(): java.lang.String

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

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

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

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 <init>(): void
     public final method getProp(): int

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 <init>(): void
     public final method getProp(): int

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

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 <init>(): void
     public final method getProp(): int

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 <init>(): void
     public final method getProp(): int

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 <init>(): void
     public method getProp(): int

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

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 <init>(): 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

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 <init>(): 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 <init>(): void

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 <init>(): void
     public final @org.jetbrains.annotations.NotNull method getDelegate(): java.lang.String

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 <init>(): void
     private final method getProp(): int