[K/N][IR] Ref to expect property in actual declaration is not remapped

^KT-36880

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/ModuleIndex.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.backend.konan.ir
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
@@ -25,9 +26,15 @@ class ModuleIndex(val module: IrModuleFragment) {
      */
     val functions: Map<FunctionDescriptor, IrFunction>
 
+    /**
+     * Contains all properties declared in [module]
+     */
+    val properties: Map<PropertyDescriptor, IrProperty>
+
     init {
         classes = mutableMapOf()
         functions = mutableMapOf()
+        properties = mutableMapOf()
 
         module.acceptVoid(object : IrElementVisitorVoid {
             override fun visitElement(element: IrElement) {
@@ -44,6 +51,11 @@ class ModuleIndex(val module: IrModuleFragment) {
                 super.visitFunction(declaration)
                 functions[declaration.descriptor] = declaration
             }
+
+            override fun visitProperty(declaration: IrProperty) {
+                super.visitProperty(declaration)
+                properties[declaration.descriptor] = declaration
+            }
         })
     }
 }

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ExpectDeclarationsRemoving.kt

@@ -89,9 +89,12 @@ internal class ExpectToActualDefaultValueCopier(private val irModule: IrModuleFr
         })
     }
 
-    private inline fun <reified T: IrFunction> T.findActualForExpected(): T =
+    private inline fun <reified T : IrFunction> T.findActualForExpected(): T =
             moduleIndex.functions[descriptor.findActualForExpect()] as T
 
+    private fun IrProperty.findActualForExpected(): IrProperty =
+            moduleIndex.properties[descriptor.findActualForExpect()]!!
+
     private fun IrClass.findActualForExpected(): IrClass =
             moduleIndex.classes[descriptor.findActualForExpect()]!!
 
@@ -147,6 +150,12 @@ internal class ExpectToActualDefaultValueCopier(private val irModule: IrModuleFr
                 else -> super.getReferencedSimpleFunction(symbol)
             }
 
+            override fun getReferencedProperty(symbol: IrPropertySymbol) =
+                    if (symbol.descriptor.isExpect)
+                        symbol.owner.findActualForExpected().symbol
+                    else
+                        super.getReferencedProperty(symbol)
+
             override fun getReferencedValue(symbol: IrValueSymbol) =
                     remapExpectValue(symbol)?.symbol ?: super.getReferencedValue(symbol)
         }

kotlin-native/backend.native/tests/build.gradle

@@ -4640,6 +4640,13 @@ linkTest("private_fake_overrides_1") {
     goldValue = "PASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\nPASS\n"
 }
 
+linkTest("remap_expect_property_refs") {
+    source = "codegen/mpp/remap_expect_property_ref_main.kt"
+    lib = "codegen/mpp/remap_expect_property_ref_lib.kt"
+    flags = ["-Xmulti-platform"]
+    goldValue = "42\n"
+}
+
 Task frameworkTest(String name, Closure<FrameworkTest> configurator) {
     return KotlinNativeTestKt.createTest(project, name, FrameworkTest) { task ->
         configurator.delegate = task

kotlin-native/backend.native/tests/codegen/mpp/remap_expect_property_ref_lib.kt

@@ -0,0 +1,11 @@
+expect class Foo {
+    val p: Int
+    fun bar(r: () -> Int = this::p): Int
+}
+actual class Foo {
+    actual val p = 42
+    actual fun bar(r: () -> Int) = r()
+}
+fun main() {
+    println(Foo().bar())
+}

kotlin-native/backend.native/tests/codegen/mpp/remap_expect_property_ref_main.kt

@@ -0,0 +1 @@
+// empty