[FIR] FirJvmMangleComputer: cleanup code

^KT-54311
This commit is contained in:
Dmitrii Gridin
2022-10-05 14:20:16 +02:00
committed by Space Team
parent 5f9076fb7a
commit 327ceceaec
@@ -223,6 +223,7 @@ open class FirJvmMangleComputer(
mangleType(tBuilder, type.fullyExpandedType(session)) mangleType(tBuilder, type.fullyExpandedType(session))
return return
} }
is FirClassSymbol -> symbol.fir.accept(copy(MangleMode.FQNAME), false) is FirClassSymbol -> symbol.fir.accept(copy(MangleMode.FQNAME), false)
is FirTypeParameterSymbol -> tBuilder.mangleTypeParameterReference(symbol.fir) is FirTypeParameterSymbol -> tBuilder.mangleTypeParameterReference(symbol.fir)
// This is performed for a case with invisible class-like symbol in fake override // This is performed for a case with invisible class-like symbol in fake override
@@ -255,9 +256,11 @@ open class FirJvmMangleComputer(
tBuilder.appendSignature(MangleConstant.ENHANCED_NULLABILITY_MARK) tBuilder.appendSignature(MangleConstant.ENHANCED_NULLABILITY_MARK)
} }
} }
is ConeRawType -> { is ConeRawType -> {
mangleType(tBuilder, type.lowerBound) mangleType(tBuilder, type.lowerBound)
} }
is ConeFlexibleType -> { is ConeFlexibleType -> {
with(session.typeContext) { with(session.typeContext) {
// Need to reproduce type approximation done for flexible types in TypeTranslator. // Need to reproduce type approximation done for flexible types in TypeTranslator.
@@ -273,17 +276,21 @@ open class FirJvmMangleComputer(
} else mangleType(tBuilder, upper) } else mangleType(tBuilder, upper)
} }
} }
is ConeDefinitelyNotNullType -> { is ConeDefinitelyNotNullType -> {
// E.g. not-null type parameter in Java // E.g. not-null type parameter in Java
mangleType(tBuilder, type.original) mangleType(tBuilder, type.original)
} }
is ConeCapturedType -> { is ConeCapturedType -> {
mangleType(tBuilder, type.lowerType ?: type.constructor.supertypes!!.first()) mangleType(tBuilder, type.lowerType ?: type.constructor.supertypes!!.first())
} }
is ConeIntersectionType -> { is ConeIntersectionType -> {
// TODO: add intersectionTypeApproximation // TODO: add intersectionTypeApproximation
mangleType(tBuilder, type.intersectedTypes.first()) mangleType(tBuilder, type.intersectedTypes.first())
} }
else -> error("Unexpected type $type") else -> error("Unexpected type $type")
} }
} }