From 4af2aaedb1a236102be0026d12a2b4a967587285 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Sun, 21 Mar 2021 19:44:43 +0300 Subject: [PATCH] IR, temporary: a simpler mangling for flexible types Mangling for flexible types will need another look. Complicated cases still do not work. --- .../mangle/descriptor/DescriptorMangleComputer.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt index 9f564b9d8e6..d5dccb27e63 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt @@ -198,13 +198,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr is DynamicType -> tBuilder.appendSignature(MangleConstant.DYNAMIC_MARK) is FlexibleType -> { // TODO: is that correct way to mangle flexible type? - with(MangleConstant.FLEXIBLE_TYPE) { - tBuilder.appendSignature(prefix) - mangleType(tBuilder, type.lowerBound) - tBuilder.appendSignature(separator) - mangleType(tBuilder, type.upperBound) - tBuilder.appendSignature(suffix) - } + mangleType(tBuilder, type.upperBound) } else -> error("Unexpected type $wtype") }