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

FIR serializer: transform KSuspendFunction types too

Browse Source
This commit is contained in:
Jinseong Jeon
2020-07-15 01:12:23 -07:00
committed by Mikhail Glukhikh
parent 85e822e283
commit d66c6c7e1e
1 changed files with 6 additions and 4 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
+6 -4
View File
@@ -607,9 +607,11 @@ class FirElementSerializer private constructor(
private fun transformSuspendFunctionToRuntimeFunctionType(type: ConeClassLikeType): ConeClassLikeType { private fun transformSuspendFunctionToRuntimeFunctionType(type: ConeClassLikeType): ConeClassLikeType {
val suspendClassId = type.classId!! val suspendClassId = type.classId!!
val runtimeClassId = FunctionClassDescriptor.Kind.Function.let { val relativeClassName = suspendClassId.relativeClassName.asString()
ClassId(it.packageFqName, Name.identifier(suspendClassId.relativeClassName.asString().drop("Suspend".length))) val kind =
} if (relativeClassName.startsWith("K")) FunctionClassDescriptor.Kind.KFunction
else FunctionClassDescriptor.Kind.Function
val runtimeClassId = ClassId(kind.packageFqName, Name.identifier(relativeClassName.replaceFirst("Suspend", "")))
val continuationClassId = CONTINUATION_INTERFACE_CLASS_ID val continuationClassId = CONTINUATION_INTERFACE_CLASS_ID
return ConeClassLikeLookupTagImpl(runtimeClassId).constructClassType( return ConeClassLikeLookupTagImpl(runtimeClassId).constructClassType(
(type.typeArguments.toList() + ConeClassLikeLookupTagImpl(continuationClassId).constructClassType( (type.typeArguments.toList() + ConeClassLikeLookupTagImpl(continuationClassId).constructClassType(
@@ -621,7 +623,7 @@ class FirElementSerializer private constructor(
} }
private fun fillFromPossiblyInnerType(builder: ProtoBuf.Type.Builder, type: ConeClassLikeType) { private fun fillFromPossiblyInnerType(builder: ProtoBuf.Type.Builder, type: ConeClassLikeType) {
val classifierSymbol = type.lookupTag.toSymbol(session)!! val classifierSymbol = type.lookupTag.toSymbol(session) ?: error("Can't lookup $type")
val classifier = classifierSymbol.fir val classifier = classifierSymbol.fir
val classifierId = getClassifierId(classifier) val classifierId = getClassifierId(classifier)
builder.className = classifierId builder.className = classifierId