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

[K/N][IR] Workaround for off-scope type parameters

Browse Source 
#KT-56500 Fixed
This commit is contained in:
Igor Chevdar
2023-02-15 17:20:03 +02:00
committed by Space Team
parent 5d3b61364a
commit 0f384f5878
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionReferenceLowering.kt
+8 -4
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.backend.konan.lower
import org.jetbrains.kotlin.backend.common.* import org.jetbrains.kotlin.backend.common.*
import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound
import org.jetbrains.kotlin.backend.konan.NativeGenerationState import org.jetbrains.kotlin.backend.konan.NativeGenerationState
import org.jetbrains.kotlin.backend.konan.descriptors.synthesizedName import org.jetbrains.kotlin.backend.konan.descriptors.synthesizedName
import org.jetbrains.kotlin.backend.konan.llvm.computeFullName import org.jetbrains.kotlin.backend.konan.llvm.computeFullName
@@ -276,10 +277,13 @@ internal class FunctionReferenceLowering(val generationState: NativeGenerationSt
*/ */
private fun substituteTypeParameterOfReferencedFunction(typeParameter: IrTypeParameter): IrType { private fun substituteTypeParameterOfReferencedFunction(typeParameter: IrTypeParameter): IrType {
if (typeParameter.parent != referencedFunction) { if (typeParameter.parent != referencedFunction) {
compilationException( // TODO: We might have references to off-scope type parameters (because of the inliner, see KT-56500 for details).
"The type parameter ${typeParameter.render()} is not defined in the referenced function ${referencedFunction.render()}", // Fixing inliner requires a lot of work, so just return the upper bound for now instead of throwing an error.
functionReference // compilationException(
) // "The type parameter ${typeParameter.render()} is not defined in the referenced function ${referencedFunction.render()}",
// functionReference
// )
return typeParameter.erasedUpperBound.defaultType
} }
return typeParameterRemapper.remapType(allTypeParametersAndArguments[typeParameter.index].second) return typeParameterRemapper.remapType(allTypeParametersAndArguments[typeParameter.index].second)
} }