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

Move FirConstDeserializer to fir:java.
This commit is contained in:
Alexander Udalov
2023-08-01 15:29:56 +02:00
committed by Space Team
parent 3e313bca78
commit bdd94dddaa
5 changed files with 34 additions and 14 deletions
@@ -0,0 +1,44 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.java.deserialization
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.deserialization.FirConstDeserializer
import org.jetbrains.kotlin.fir.deserialization.buildFirConstant
import org.jetbrains.kotlin.fir.deserialization.replaceName
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.deserialization.Flags
import org.jetbrains.kotlin.metadata.deserialization.NameResolver
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
class FirJvmConstDeserializer(
session: FirSession,
private val binaryClass: KotlinJvmBinaryClass,
protocol: SerializerExtensionProtocol,
) : FirConstDeserializer(session, protocol) {
override fun loadConstant(propertyProto: ProtoBuf.Property, callableId: CallableId, nameResolver: NameResolver): FirExpression? {
if (!Flags.HAS_CONSTANT.get(propertyProto.flags)) return null
constantCache[callableId]?.let { return it }
binaryClass.visitMembers(object : KotlinJvmBinaryClass.MemberVisitor {
override fun visitMethod(name: Name, desc: String): KotlinJvmBinaryClass.MethodAnnotationVisitor? = null
override fun visitField(name: Name, desc: String, initializer: Any?): KotlinJvmBinaryClass.AnnotationVisitor? {
if (initializer != null) {
val constant = buildFirConstant(null, initializer, desc, nameResolver)
constant?.let { constantCache[callableId.replaceName(name)] = it }
}
return null
}
}, null)
return constantCache[callableId]
}
}
@@ -8,14 +8,28 @@ package org.jetbrains.kotlin.fir.java.deserialization
import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsSignatures
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.builder.FirRegularClassBuilder
import org.jetbrains.kotlin.fir.deserialization.FirConstDeserializer
import org.jetbrains.kotlin.fir.deserialization.FirDeserializationExtension
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.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
class FirJvmDeserializationExtension(session: FirSession) : FirDeserializationExtension(session) {
override fun createConstDeserializer(
containerSource: DeserializedContainerSource?,
session: FirSession,
serializerExtensionProtocol: SerializerExtensionProtocol,
): FirConstDeserializer? =
if (containerSource is KotlinJvmBinarySourceElement)
FirJvmConstDeserializer(session, containerSource.binaryClass, serializerExtensionProtocol)
else
null
override fun FirRegularClassBuilder.configureDeserializedClass(classId: ClassId) {
addSerializableIfNeeded(classId)
}