azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed dispatch receiver during copying of function descriptor

Browse Source
This commit is contained in:
Igor Chevdar
2017-04-03 17:21:27 +03:00
parent 8dbdd9422d
commit 6c1c86abaf
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDescriptoros.kt
+6 -2
View File
@@ -77,6 +77,7 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
val oldDescriptor = declaration.descriptor val oldDescriptor = declaration.descriptor
val newDescriptor = copyClassDescriptor(oldDescriptor) val newDescriptor = copyClassDescriptor(oldDescriptor)
descriptorSubstituteMap[oldDescriptor] = newDescriptor descriptorSubstituteMap[oldDescriptor] = newDescriptor
descriptorSubstituteMap[oldDescriptor.thisAsReceiverParameter] = newDescriptor.thisAsReceiverParameter
super.visitClass(declaration) super.visitClass(declaration)
val constructors = oldDescriptor.constructors.map { val constructors = oldDescriptor.constructors.map {
@@ -158,13 +159,16 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
oldDescriptor.source oldDescriptor.source
).apply { isTailrec = oldDescriptor.isTailrec } ).apply { isTailrec = oldDescriptor.isTailrec }
val newDispatchReceiverParameter = null // TODO val oldDispatchReceiverParameter = oldDescriptor.dispatchReceiverParameter
val newDispatchReceiverParameter =
if (oldDispatchReceiverParameter == null) null
else descriptorSubstituteMap[oldDispatchReceiverParameter]
val newTypeParameters = oldDescriptor.typeParameters val newTypeParameters = oldDescriptor.typeParameters
val newValueParameters = copyValueParameters(oldDescriptor.valueParameters, memberOwner) val newValueParameters = copyValueParameters(oldDescriptor.valueParameters, memberOwner)
newDescriptor.initialize( newDescriptor.initialize(
oldDescriptor.extensionReceiverParameter?.type, oldDescriptor.extensionReceiverParameter?.type,
newDispatchReceiverParameter, newDispatchReceiverParameter as? ReceiverParameterDescriptor,
newTypeParameters, newTypeParameters,
newValueParameters, newValueParameters,
oldDescriptor.returnType, oldDescriptor.returnType,