[IR BE] Fix symbol remapping for IrField/IrProperty

- Use appropriate wrapped descriptor
 - Add test

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/DeepCopyIrTreeWithDescriptors.kt

@@ -61,7 +61,12 @@ internal class DeepCopyIrTreeWithSymbolsForInliner(
             }
 
             override fun visitField(declaration: IrField) {
-                (declaration.descriptor as? WrappedFieldDescriptor)?.bind(declaration)
+                (declaration.descriptor as WrappedFieldDescriptor).bind(declaration)
+                declaration.acceptChildrenVoid(this)
+            }
+
+            override fun visitProperty(declaration: IrProperty) {
+                (declaration.descriptor as WrappedPropertyDescriptor).bind(declaration)
                 declaration.acceptChildrenVoid(this)
             }
 
@@ -122,6 +127,9 @@ internal class DeepCopyIrTreeWithSymbolsForInliner(
         override fun remapDeclaredField(descriptor: PropertyDescriptor) =
             WrappedFieldDescriptor(descriptor.annotations, descriptor.source)
 
+        override fun remapDeclaredProperty(descriptor: PropertyDescriptor) =
+            WrappedPropertyDescriptor(descriptor.annotations, descriptor.source)
+
         override fun remapDeclaredSimpleFunction(descriptor: FunctionDescriptor) =
             WrappedSimpleFunctionDescriptor(descriptor.annotations, descriptor.source)
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt

@@ -84,10 +84,7 @@ open class DeepCopySymbolRemapper(
 
     override fun visitField(declaration: IrField) {
         remapSymbol(fields, declaration) {
-            if (declaration.correspondingProperty == null)
-                IrFieldSymbolImpl(descriptorsRemapper.remapDeclaredField(it.descriptor))
-            else
-                IrFieldSymbolImpl(descriptorsRemapper.remapDeclaredProperty(it.descriptor))
+            IrFieldSymbolImpl(descriptorsRemapper.remapDeclaredField(it.descriptor))
         }
         declaration.acceptChildrenVoid(this)
     }

compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt

@@ -0,0 +1,33 @@
+// MODULE: lib
+// FILE: lib.kt
+
+import kotlin.reflect.*
+
+class Delegate {
+    var inner = "OK"
+    operator fun getValue(t: Any?, p: KProperty<*>): String = inner
+}
+
+inline fun <T> foo(b: () -> T): T {
+    return b()
+}
+
+fun del() = Delegate()
+
+// MODULE: lib2(lib)
+// FILE: lib2.kt
+
+fun qux() = foo {
+    val f = object {
+        val a by del()
+    }
+
+    f.a
+}
+
+// MODULE: main(lib2)
+// FILE: main.kt
+
+fun box(): String {
+    return qux()
+}

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java

@@ -9305,6 +9305,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt");
         }
 
+        @TestMetadata("insideInlinedObjectMultiModule.kt")
+        public void testInsideInlinedObjectMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt");
+        }
+
         @TestMetadata("kt4138.kt")
         public void testKt4138() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/kt4138.kt");

compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -9305,6 +9305,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt");
         }
 
+        @TestMetadata("insideInlinedObjectMultiModule.kt")
+        public void testInsideInlinedObjectMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt");
+        }
+
         @TestMetadata("kt4138.kt")
         public void testKt4138() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/kt4138.kt");

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java

@@ -9305,6 +9305,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt");
         }
 
+        @TestMetadata("insideInlinedObjectMultiModule.kt")
+        public void testInsideInlinedObjectMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt");
+        }
+
         @TestMetadata("kt4138.kt")
         public void testKt4138() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/kt4138.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java

@@ -7095,6 +7095,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt");
         }
 
+        @TestMetadata("insideInlinedObjectMultiModule.kt")
+        public void testInsideInlinedObjectMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt");
+        }
+
         @TestMetadata("kt4138.kt")
         public void testKt4138() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/kt4138.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java

@@ -8180,6 +8180,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt");
         }
 
+        @TestMetadata("insideInlinedObjectMultiModule.kt")
+        public void testInsideInlinedObjectMultiModule() throws Exception {
+            runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt");
+        }
+
         @TestMetadata("kt4138.kt")
         public void testKt4138() throws Exception {
             runTest("compiler/testData/codegen/box/delegatedProperty/kt4138.kt");