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

backend.common: fix minor bug in LocalFunctionsLowering

Browse Source 
extension receiver parameter should be remapped too
(e.g. to support lambda with receiver)
This commit is contained in:
Svyatoslav Scherbina
2016-12-13 14:26:53 +07:00
committed by SvyatoslavScherbina
parent 7cebc4f676
commit a6a6c677a3
1 changed files with 7 additions and 3 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/lower/LocalFunctionsLowering.kt
+7 -3
View File
@@ -57,7 +57,7 @@ class LocalFunctionsLowering(val context: BackendContext): DeclarationContainerL
lateinit var transformedDescriptor: FunctionDescriptor lateinit var transformedDescriptor: FunctionDescriptor
val old2new: MutableMap<ValueDescriptor, ValueParameterDescriptor> = HashMap() val old2new: MutableMap<ValueDescriptor, ValueDescriptor> = HashMap()
var index: Int = -1 var index: Int = -1
@@ -67,7 +67,7 @@ class LocalFunctionsLowering(val context: BackendContext): DeclarationContainerL
private inner class LocalFunctionsTransformer(val memberFunction: IrFunction) { private inner class LocalFunctionsTransformer(val memberFunction: IrFunction) {
val localFunctions: MutableMap<FunctionDescriptor, LocalFunctionContext> = LinkedHashMap() val localFunctions: MutableMap<FunctionDescriptor, LocalFunctionContext> = LinkedHashMap()
val new2old: MutableMap<ValueParameterDescriptor, ValueDescriptor> = HashMap() val new2old: MutableMap<ValueDescriptor, ValueDescriptor> = HashMap()
fun lowerLocalFunctions(): List<IrDeclaration>? { fun lowerLocalFunctions(): List<IrDeclaration>? {
collectLocalFunctions() collectLocalFunctions()
@@ -285,10 +285,14 @@ class LocalFunctionsLowering(val context: BackendContext): DeclarationContainerL
Visibilities.PRIVATE Visibilities.PRIVATE
) )
oldDescriptor.extensionReceiverParameter?.let {
localFunctionContext.recordRemapped(it, newDescriptor.extensionReceiverParameter!!)
}
return newDescriptor return newDescriptor
} }
private fun LocalFunctionContext.recordRemapped(oldDescriptor: ValueDescriptor, newDescriptor: ValueParameterDescriptor): ValueParameterDescriptor { private fun LocalFunctionContext.recordRemapped(oldDescriptor: ValueDescriptor, newDescriptor: ValueDescriptor): ValueDescriptor {
old2new[oldDescriptor] = newDescriptor old2new[oldDescriptor] = newDescriptor
new2old[newDescriptor] = oldDescriptor new2old[newDescriptor] = oldDescriptor
return newDescriptor return newDescriptor