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

Added extension receiver procesing on interface lowering

Browse Source
This commit is contained in:
Michael Bogdanov
2016-10-06 14:17:29 +03:00
committed by Dmitry Petrov
parent f0d09288a8
commit 289cc8fed7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt
+11 -2
View File
@@ -66,7 +66,10 @@ class InterfaceLowering(val state: GenerationState) : IrElementTransformerVoid()
it.body = null it.body = null
val mapping: Map<DeclarationDescriptor, ValueParameterDescriptor> = val mapping: Map<DeclarationDescriptor, ValueParameterDescriptor> =
(listOf(it.descriptor.dispatchReceiverParameter!!) + it.descriptor.valueParameters).zip(functionDescriptorImpl.valueParameters).toMap() (
listOf(it.descriptor.dispatchReceiverParameter!!, it.descriptor.extensionReceiverParameter).filterNotNull() +
it.descriptor.valueParameters
).zip(functionDescriptorImpl.valueParameters).toMap()
newFunction.body?.transform(VariableRemapper(mapping), null) newFunction.body?.transform(VariableRemapper(mapping), null)
} }
@@ -110,8 +113,14 @@ class InterfaceLowering(val state: GenerationState) : IrElementTransformerVoid()
ValueParameterDescriptorImpl.createWithDestructuringDeclarations( ValueParameterDescriptorImpl.createWithDestructuringDeclarations(
newFunction, null, 0, AnnotationsImpl(emptyList()), Name.identifier("this"), newFunction, null, 0, AnnotationsImpl(emptyList()), Name.identifier("this"),
interfaceDescriptor.defaultType, false, false, false, false, null, interfaceDescriptor.source, null) interfaceDescriptor.defaultType, false, false, false, false, null, interfaceDescriptor.source, null)
val oldExtensionReceiver = descriptor.extensionReceiverParameter
val extensionReceiver = if (oldExtensionReceiver != null )
ValueParameterDescriptorImpl.createWithDestructuringDeclarations(
newFunction, null, 1, AnnotationsImpl(emptyList()), Name.identifier("receiver"),
oldExtensionReceiver.value.type, false, false, false, false, null, oldExtensionReceiver.source, null)
else null
val valueParameters = listOf(dispatchReceiver) + val valueParameters = listOf(dispatchReceiver, extensionReceiver).filterNotNull() +
descriptor.valueParameters.map { it.copy(newFunction, it.name, it.index + 1) } descriptor.valueParameters.map { it.copy(newFunction, it.name, it.index + 1) }
newFunction.initialize( newFunction.initialize(