Skip to content

Suggested workaround for KT-81241 #5509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Suggested workaround for KT-81241 #5509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 21 additions & 29 deletions compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,36 +1008,28 @@ fun IrType.remapTypeParameters(
srcToDstParameterMap: Map<IrTypeParameter, IrTypeParameter>? = null
): IrType =
when (this) {
is IrSimpleType -> {
is IrSimpleType if (classifier.owner is IrTypeParameter || classifier.owner is IrClass) -> {
val classifier = classifier.owner
when {
classifier is IrTypeParameter -> {
val newClassifier =
srcToDstParameterMap?.get(classifier) ?: if (classifier.parent == source)
target.typeParameters[classifier.index]
else
classifier
IrSimpleTypeImpl(newClassifier.symbol, nullability, arguments, annotations)
}

classifier is IrClass ->
IrSimpleTypeImpl(
classifier.symbol,
nullability,
arguments.memoryOptimizedMap {
when (it) {
is IrTypeProjection -> makeTypeProjection(
it.type.remapTypeParameters(source, target, srcToDstParameterMap),
it.variance
)
is IrStarProjection -> it
}
},
annotations
)

else -> this
}
val newSymbol: IrClassifierSymbol = when (classifier) {
is IrTypeParameter if srcToDstParameterMap?.get(classifier) != null -> srcToDstParameterMap[classifier]!!.symbol
is IrTypeParameter if classifier.parent == source && target.typeParameters.size > classifier.index -> target.typeParameters[classifier.index].symbol
else -> classifier.symbol
} as IrClassifierSymbol

IrSimpleTypeImpl(
newSymbol,
nullability,
if (classifier is IrClass) arguments.memoryOptimizedMap {
when (it) {
is IrTypeProjection -> makeTypeProjection(
it.type.remapTypeParameters(source, target, srcToDstParameterMap),
it.variance
)
is IrStarProjection -> it
}
} else arguments,
annotations
)
}
else -> this
}
Expand Down