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

IR: change mangling for flexible types in DescriptorMangleComputer

Browse Source 
This reverts commit 4af2aaedb1.
This commit is contained in:
Georgy Bronnikov
2021-07-16 13:54:00 +03:00
committed by TeamCityServer
parent afacff326d
commit 1d2d1f9e8d
1 changed files with 15 additions and 2 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
+15 -2
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.ir.descriptors.IrImplementingDelegateDescriptor
import org.jetbrains.kotlin.ir.descriptors.IrPropertyDelegateDescriptor import org.jetbrains.kotlin.ir.descriptors.IrPropertyDelegateDescriptor
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.typeUtil.isUnit import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsByExistingArgumentsWith
import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
abstract class DescriptorMangleComputer(protected val builder: StringBuilder, private val mode: MangleMode) : abstract class DescriptorMangleComputer(protected val builder: StringBuilder, private val mode: MangleMode) :
@@ -197,8 +198,20 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
} }
is DynamicType -> tBuilder.appendSignature(MangleConstant.DYNAMIC_MARK) is DynamicType -> tBuilder.appendSignature(MangleConstant.DYNAMIC_MARK)
is FlexibleType -> { is FlexibleType -> {
// TODO: is that correct way to mangle flexible type? // Reproduce type approximation done for flexible types in TypeTranslator.
mangleType(tBuilder, type.upperBound) val upper = type.upperBound
val upperDescriptor = upper.constructor.declarationDescriptor
?: error("No descriptor for type $upper")
if (upperDescriptor is ClassDescriptor) {
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) {
lower.replace(newArguments = upper.arguments)
} else lower
val mixed = intermediate.makeNullableAsSpecified(upper.isMarkedNullable)
mangleType(tBuilder, mixed)
} else mangleType(tBuilder, upper)
} }
else -> error("Unexpected type $wtype") else -> error("Unexpected type $wtype")
} }