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

K2: remove dependency fir-deserialization -> metadata.jvm

Browse Source
This commit is contained in:
Alexander Udalov
2023-08-01 15:45:55 +02:00
committed by Space Team
parent bdd94dddaa
commit 2b84463ec8
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/FirJvmDeserializationExtension.kt
+7
View File
@@ -14,6 +14,10 @@ import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.types.toLookupTag
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.deserialization.NameResolver
import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull
import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
@@ -45,6 +49,9 @@ class FirJvmDeserializationExtension(session: FirSession) : FirDeserializationEx
}
}
override fun loadModuleName(classProto: ProtoBuf.Class, nameResolver: NameResolver): String? =
classProto.getExtensionOrNull(JvmProtoBuf.classModuleName)?.let(nameResolver::getString)
companion object {
private val JAVA_IO_SERIALIZABLE = ClassId.topLevel(FqName("java.io.Serializable"))
}