Proper equality comparison for bound callable references represented as reflection objects

(including references to property accessors).

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt

@@ -23,6 +23,7 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.Member
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
+import kotlin.jvm.internal.CallableReference
 import kotlin.jvm.internal.FunctionImpl
 import kotlin.reflect.KFunction
 import kotlin.reflect.KotlinReflectionInternalError
@@ -36,12 +37,17 @@ internal class KFunctionImpl private constructor(
         override val container: KDeclarationContainerImpl,
         name: String,
         private val signature: String,
-        descriptorInitialValue: FunctionDescriptor?
+        descriptorInitialValue: FunctionDescriptor?,
+        private val boundReceiver: Any? = CallableReference.NO_RECEIVER
 ) : KCallableImpl<Any?>(), KFunction<Any?>, FunctionImpl, FunctionWithAllInvokes {
-    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : this(container, name, signature, null)
+    constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?)
+            : this(container, name, signature, null, boundReceiver)
 
     constructor(container: KDeclarationContainerImpl, descriptor: FunctionDescriptor) : this(
-            container, descriptor.name.asString(), RuntimeTypeMapper.mapSignature(descriptor).asString(), descriptor
+            container,
+            descriptor.name.asString(),
+            RuntimeTypeMapper.mapSignature(descriptor).asString(),
+            descriptor
     )
 
     override val descriptor: FunctionDescriptor by ReflectProperties.lazySoft(descriptorInitialValue) {
@@ -140,7 +146,7 @@ internal class KFunctionImpl private constructor(
 
     override fun equals(other: Any?): Boolean {
         val that = other.asKFunctionImpl() ?: return false
-        return container == that.container && name == that.name && signature == that.signature
+        return container == that.container && name == that.name && signature == that.signature && boundReceiver == that.boundReceiver
     }
 
     override fun hashCode(): Int =

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty0Impl.kt

@@ -23,7 +23,7 @@ import kotlin.reflect.KProperty0
 internal open class KProperty0Impl<out R> : KProperty0<R>, KPropertyImpl<R> {
     constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
 
-    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(container, name, signature)
+    constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(container, name, signature, boundReceiver)
 
     private val getter_ = ReflectProperties.lazy { Getter(this) }
 
@@ -41,7 +41,7 @@ internal open class KProperty0Impl<out R> : KProperty0<R>, KPropertyImpl<R> {
 internal class KMutableProperty0Impl<R> : KProperty0Impl<R>, KMutableProperty0<R> {
     constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
 
-    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(container, name, signature)
+    constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(container, name, signature, boundReceiver)
 
     private val setter_ = ReflectProperties.lazy { Setter(this) }
 

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty1Impl.kt

@@ -21,7 +21,7 @@ import kotlin.reflect.KMutableProperty1
 import kotlin.reflect.KProperty1
 
 internal open class KProperty1Impl<T, out R> : KProperty1<T, R>, KPropertyImpl<R> {
-    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(container, name, signature)
+    constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(container, name, signature, boundReceiver)
 
     constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
 
@@ -39,7 +39,7 @@ internal open class KProperty1Impl<T, out R> : KProperty1<T, R>, KPropertyImpl<R
 }
 
 internal class KMutableProperty1Impl<T, R> : KProperty1Impl<T, R>, KMutableProperty1<T, R> {
-    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(container, name, signature)
+    constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(container, name, signature, boundReceiver)
 
     constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
 

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty2Impl.kt

@@ -21,7 +21,7 @@ import kotlin.reflect.KMutableProperty2
 import kotlin.reflect.KProperty2
 
 internal open class KProperty2Impl<D, E, out R> : KProperty2<D, E, R>, KPropertyImpl<R> {
-    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(container, name, signature)
+    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(container, name, signature, null)
 
     constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
 

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt

@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.kotlin.types.TypeUtils
 import java.lang.reflect.Field
 import java.lang.reflect.Modifier
+import kotlin.jvm.internal.CallableReference
 import kotlin.reflect.KFunction
 import kotlin.reflect.KMutableProperty
 import kotlin.reflect.KProperty
@@ -35,10 +36,11 @@ internal abstract class KPropertyImpl<out R> private constructor(
         override val container: KDeclarationContainerImpl,
         override val name: String,
         val signature: String,
-        descriptorInitialValue: PropertyDescriptor?
+        descriptorInitialValue: PropertyDescriptor?,
+        private val boundReceiver: Any? = CallableReference.NO_RECEIVER
 ) : KCallableImpl<R>(), KProperty<R> {
-    constructor(container: KDeclarationContainerImpl, name: String, signature: String) : this(
-            container, name, signature, null
+    constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : this(
+            container, name, signature, null, boundReceiver
     )
 
     constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : this(
@@ -95,7 +97,7 @@ internal abstract class KPropertyImpl<out R> private constructor(
 
     override fun equals(other: Any?): Boolean {
         val that = other.asKPropertyImpl() ?: return false
-        return container == that.container && name == that.name && signature == that.signature
+        return container == that.container && name == that.name && signature == that.signature && boundReceiver == that.boundReceiver
     }
 
     override fun hashCode(): Int =

core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java

@@ -66,29 +66,29 @@ public class ReflectionFactoryImpl extends ReflectionFactory {
 
     @Override
     public KFunction function(FunctionReference f) {
-        return new KFunctionImpl(getOwner(f), f.getName(), f.getSignature());
+        return new KFunctionImpl(getOwner(f), f.getName(), f.getSignature(), f.getBoundReceiver());
     }
 
     // Properties
 
     @Override
     public KProperty0 property0(PropertyReference0 p) {
-        return new KProperty0Impl(getOwner(p), p.getName(), p.getSignature());
+        return new KProperty0Impl(getOwner(p), p.getName(), p.getSignature(), p.getBoundReceiver());
     }
 
     @Override
     public KMutableProperty0 mutableProperty0(MutablePropertyReference0 p) {
-        return new KMutableProperty0Impl(getOwner(p), p.getName(), p.getSignature());
+        return new KMutableProperty0Impl(getOwner(p), p.getName(), p.getSignature(), p.getBoundReceiver());
     }
 
     @Override
     public KProperty1 property1(PropertyReference1 p) {
-        return new KProperty1Impl(getOwner(p), p.getName(), p.getSignature());
+        return new KProperty1Impl(getOwner(p), p.getName(), p.getSignature(), p.getBoundReceiver());
     }
 
     @Override
     public KMutableProperty1 mutableProperty1(MutablePropertyReference1 p) {
-        return new KMutableProperty1Impl(getOwner(p), p.getName(), p.getSignature());
+        return new KMutableProperty1Impl(getOwner(p), p.getName(), p.getSignature(), p.getBoundReceiver());
     }
 
     @Override