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

FIR element serializer: drop duplicated approximation code

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-17 13:57:00 +03:00
parent 104f088d4e
commit 5a919cc827
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
+7 -10
View File
@@ -550,19 +550,12 @@ class FirElementSerializer private constructor(
fun typeId(type: ConeKotlinType): Int = typeTable[typeProto(type)]
private fun typeProto(typeRef: FirTypeRef, toSuper: Boolean = false): ProtoBuf.Type.Builder {
val approximatedType = when (typeRef.coneType) {
is ConeIntegerLiteralType,
is ConeDefinitelyNotNullType,
is ConeIntersectionType ->
typeRef.approximated(typeApproximator, toSuper)
else -> typeRef
}
return typeProto(approximatedType.coneType).also {
return typeProto(typeRef.coneType, toSuper).also {
extension.serializeType(typeRef, it)
}
}
private fun typeProto(type: ConeKotlinType): ProtoBuf.Type.Builder {
private fun typeProto(type: ConeKotlinType, toSuper: Boolean = false): ProtoBuf.Type.Builder {
val builder = ProtoBuf.Type.newBuilder()
when (type) {
@@ -601,7 +594,11 @@ class FirElementSerializer private constructor(
is ConeDefinitelyNotNullType,
is ConeIntersectionType,
is ConeIntegerLiteralType -> {
val approximatedType = typeApproximator.approximateToSubType(type, TypeApproximatorConfiguration.PublicDeclaration)
val approximatedType = if (toSuper) {
typeApproximator.approximateToSuperType(type, TypeApproximatorConfiguration.PublicDeclaration)
} else {
typeApproximator.approximateToSubType(type, TypeApproximatorConfiguration.PublicDeclaration)
}
assert(approximatedType != type && approximatedType is ConeKotlinType) {
"Approximation failed: ${type.render()}"
}