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

JVM_IR: special case for raw types in DescriptorMangleComputer

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-09-11 22:34:25 +03:00
committed by teamcityserver
parent 247cbffbac
commit 64e2911b58
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
+1 -1
View File
@@ -206,7 +206,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
val lower = type.lowerBound
val lowerDescriptor = lower.constructor.declarationDescriptor as? ClassDescriptor
?: error("No class descriptor for lower type $lower of $type")
val intermediate = if (lowerDescriptor == upperDescriptor) {
val intermediate = if (lowerDescriptor == upperDescriptor && type !is RawType) {
lower.replace(newArguments = upper.arguments)
} else lower
val mixed = intermediate.makeNullableAsSpecified(upper.isMarkedNullable)