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

JVM_IR fix nullability of special bridge return type

Browse Source
This commit is contained in:
Dmitry Petrov
2021-11-19 20:01:03 +03:00
committed by Space
parent 987cbd58e9
commit aa0c2ddea5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrTypeUtils.kt
+9 -4
View File
@@ -131,10 +131,15 @@ fun IrType.eraseToScope(scopeOwner: IrTypeParametersContainer): IrType =
fun IrType.eraseToScope(visibleTypeParameters: Set<IrTypeParameter>): IrType { fun IrType.eraseToScope(visibleTypeParameters: Set<IrTypeParameter>): IrType {
require(this is IrSimpleType) { error("Unexpected IrType kind: ${render()}") } require(this is IrSimpleType) { error("Unexpected IrType kind: ${render()}") }
return when (classifier) { return when (classifier) {
is IrClassSymbol -> IrSimpleTypeImpl( is IrClassSymbol ->
classifier, hasQuestionMark, arguments.map { it.eraseToScope(visibleTypeParameters) }, annotations IrSimpleTypeImpl(
) classifier, hasQuestionMark, arguments.map { it.eraseToScope(visibleTypeParameters) }, annotations
is IrTypeParameterSymbol -> if (classifier.owner in visibleTypeParameters) this else upperBound )
is IrTypeParameterSymbol ->
if (classifier.owner in visibleTypeParameters)
this
else
upperBound.withHasQuestionMark(this.hasQuestionMark)
else -> error("unknown IrType classifier kind: ${classifier.owner.render()}") else -> error("unknown IrType classifier kind: ${classifier.owner.render()}")
} }
} }