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

[Commonizer] Simplify CirClassOrTypeAliasType.withParentArguments()

Browse Source 
^KT-48288
This commit is contained in:
sebastian.sellmair
2021-09-16 14:55:21 +02:00
committed by Space
parent 459e01a729
commit e1bc6c54d7
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/utils.kt
+3 -11
View File
@@ -90,17 +90,9 @@ internal fun CirClassOrTypeAliasType.withParentArguments(
val newIsMarkedNullable = isMarkedNullable || parentIsMarkedNullable val newIsMarkedNullable = isMarkedNullable || parentIsMarkedNullable
val newArguments = arguments.map { oldArgument -> val newArguments = arguments.map { oldArgument ->
if (oldArgument is CirRegularTypeProjection) { if (oldArgument !is CirRegularTypeProjection) return@map oldArgument
val oldArgumentType = oldArgument.type if (oldArgument.type !is CirTypeParameterType) return@map oldArgument
if (oldArgumentType is CirTypeParameterType) { parentArguments[oldArgument.type.index]
when (val parentArgument = parentArguments[oldArgumentType.index]) {
is CirRegularTypeProjection -> if (parentArgument is CirClassOrTypeAliasType) return@map parentArgument
is CirStarTypeProjection -> return@map parentArgument
}
return@map parentArguments[oldArgumentType.index]
}
}
oldArgument
} }
return when (val newUnderlyingType = makeNullableIfNecessary(newIsMarkedNullable).withArguments(newArguments)) { return when (val newUnderlyingType = makeNullableIfNecessary(newIsMarkedNullable).withArguments(newArguments)) {