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

[JS IC] Don't serialize IrTypeAbbreviation in IC cache

Browse Source
This commit is contained in:
Roman Artemev
2021-08-05 11:11:40 +03:00
committed by teamcityserver
parent d174e8c3d2
commit 67f814c99f
1 changed files with 20 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/IrFileSerializer.kt
+20 -10
View File
@@ -399,8 +399,10 @@ open class IrFileSerializer(
.addAllAnnotation(serializeAnnotations(type.annotations)) .addAllAnnotation(serializeAnnotations(type.annotations))
.setClassifier(serializeIrSymbol(type.classifier)) .setClassifier(serializeIrSymbol(type.classifier))
.setHasQuestionMark(type.hasQuestionMark) .setHasQuestionMark(type.hasQuestionMark)
type.abbreviation?.let { type.abbreviation?.let { ta ->
proto.setAbbreviation(serializeIrTypeAbbreviation(it)) serializeIrTypeAbbreviation(ta)?.let { pta ->
proto.setAbbreviation(pta)
}
} }
type.arguments.forEach { type.arguments.forEach {
proto.addArgument(serializeTypeArgument(it)) proto.addArgument(serializeTypeArgument(it))
@@ -408,15 +410,23 @@ open class IrFileSerializer(
return proto.build() return proto.build()
} }
private fun serializeIrTypeAbbreviation(typeAbbreviation: IrTypeAbbreviation): ProtoTypeAbbreviation { @Suppress("UNUSED_PARAMETER")
val proto = ProtoTypeAbbreviation.newBuilder() private fun isTypeAbbreviationAccessibleHere(typeAbbreviation: IrTypeAbbreviation): Boolean {
.addAllAnnotation(serializeAnnotations(typeAbbreviation.annotations)) return !skipMutableState
.setTypeAlias(serializeIrSymbol(typeAbbreviation.typeAlias)) }
.setHasQuestionMark(typeAbbreviation.hasQuestionMark)
typeAbbreviation.arguments.forEach { private fun serializeIrTypeAbbreviation(typeAbbreviation: IrTypeAbbreviation): ProtoTypeAbbreviation? {
proto.addArgument(serializeTypeArgument(it)) if (isTypeAbbreviationAccessibleHere(typeAbbreviation)) {
val proto = ProtoTypeAbbreviation.newBuilder()
.addAllAnnotation(serializeAnnotations(typeAbbreviation.annotations))
.setTypeAlias(serializeIrSymbol(typeAbbreviation.typeAlias))
.setHasQuestionMark(typeAbbreviation.hasQuestionMark)
typeAbbreviation.arguments.forEach {
proto.addArgument(serializeTypeArgument(it))
}
return proto.build()
} }
return proto.build() return null
} }
private fun serializeDynamicType(type: IrDynamicType): ProtoDynamicType = ProtoDynamicType.newBuilder() private fun serializeDynamicType(type: IrDynamicType): ProtoDynamicType = ProtoDynamicType.newBuilder()