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

IR: return original KotlinType from IrTupe.toKotlinType() when it possible instead of creating new one

Browse Source 
(cherry picked from commit e3b921a)
This commit is contained in:
Zalim Bashorov
2018-06-24 01:41:39 +03:00
committed by Dmitry Petrov
parent 1c2ac364c7
commit fa51b962b8
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypes.kt
+11 -5
View File
@@ -55,10 +55,15 @@ fun IrType.makeNullable() =
else else
this this
fun IrType.toKotlinType(): KotlinType = when (this) { fun IrType.toKotlinType(): KotlinType {
originalKotlinType?.let {
return it
}
return when (this) {
is IrSimpleType -> { is IrSimpleType -> {
val classifier = this.classifier.descriptor val classifier = classifier.descriptor
val arguments = this.arguments.mapIndexed { index, it -> val arguments = arguments.mapIndexed { index, it ->
when (it) { when (it) {
is IrTypeProjection -> TypeProjectionImpl(it.variance, it.type.toKotlinType()) is IrTypeProjection -> TypeProjectionImpl(it.variance, it.type.toKotlinType())
is IrStarProjection -> StarProjectionImpl((classifier as ClassDescriptor).declaredTypeParameters[index]) is IrStarProjection -> StarProjectionImpl((classifier as ClassDescriptor).declaredTypeParameters[index])
@@ -66,7 +71,8 @@ fun IrType.toKotlinType(): KotlinType = when (this) {
} }
} }
classifier.defaultType.replace(newArguments = arguments).makeNullableAsSpecified(this.hasQuestionMark) classifier.defaultType.replace(newArguments = arguments).makeNullableAsSpecified(hasQuestionMark)
}
else -> TODO(toString())
} }
else -> TODO(this.toString())
} }