Fixed containing declaration during copying of function descriptor

jzt-Tesla · Apr 4, 2017 · b960d8b · b960d8b
1 parent 6c1c86a
commit b960d8b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.../backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDescriptoros.kt b/.../backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDescriptoros.kt
@@ -150,7 +150,8 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
 
         private fun copySimpleFunctionDescriptor(oldDescriptor: SimpleFunctionDescriptor) : FunctionDescriptor {
 
-            val memberOwner = targetFunction.descriptor
+            val oldContainingDeclaration = oldDescriptor.containingDeclaration
+            val memberOwner = descriptorSubstituteMap[oldContainingDeclaration] ?: targetFunction.descriptor
             val newDescriptor = SimpleFunctionDescriptorImpl.create(
                 memberOwner,
                 oldDescriptor.annotations,
@@ -164,7 +165,7 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
                     if (oldDispatchReceiverParameter == null) null
                     else descriptorSubstituteMap[oldDispatchReceiverParameter]
             val newTypeParameters = oldDescriptor.typeParameters
-            val newValueParameters = copyValueParameters(oldDescriptor.valueParameters, memberOwner)
+            val newValueParameters = copyValueParameters(oldDescriptor.valueParameters, newDescriptor)
 
             newDescriptor.initialize(
                 oldDescriptor.extensionReceiverParameter?.type,