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

FIR serializer: accept FirClass instead of IrClass to get rid of IR deps

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-04-24 14:50:04 +03:00
parent 8d85e7a401
commit dbd4cecff6
5 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FirBasedClassCodegen.kt
+2 -2
View File
@@ -36,7 +36,7 @@ class FirBasedClassCodegen internal constructor(
private val session = (irClass.metadata as FirMetadataSource).session
private val serializerExtension = FirJvmSerializerExtension(session, visitor.serializationBindings, state, typeMapper)
private val serializerExtension = FirJvmSerializerExtension(session, visitor.serializationBindings, state, irClass, typeMapper)
private val serializer: FirElementSerializer? =
when (val metadata = irClass.metadata) {
is FirMetadataSource.Class -> FirElementSerializer.create(
@@ -77,7 +77,7 @@ class FirBasedClassCodegen internal constructor(
when (val metadata = irClass.metadata) {
is FirMetadataSource.Class -> {
val classProto = serializer!!.classProto(irClass).build()
val classProto = serializer!!.classProto(metadata.klass).build()
writeKotlinMetadata(visitor, state, KotlinClassHeader.Kind.CLASS, extraFlags) {
AsmUtil.writeAnnotationData(it, classProto, serializer.stringTable as JvmStringTable)
}