FIR: support (partially) type annotations in JVM deserialized

This commit is contained in:
Mikhail Glukhikh
2019-04-22 18:44:14 +03:00
parent 48cd9e3251
commit e3e7eea3fe
15 changed files with 96 additions and 39 deletions
@@ -0,0 +1,22 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. 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.AbstractAnnotationDeserializer
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmNameResolver
class JvmBinaryAnnotationDeserializer(
session: FirSession, nameResolver: JvmNameResolver
) : AbstractAnnotationDeserializer(session, nameResolver) {
override fun loadTypeAnnotations(typeProto: ProtoBuf.Type): List<FirAnnotationCall> {
val annotations = typeProto.getExtension(JvmProtoBuf.typeAnnotation).orEmpty()
return annotations.map { deserializeAnnotation(it) }
}
}
@@ -100,7 +100,10 @@ class KotlinDeserializedJvmSymbolsProvider(
PackagePartsCacheData(
packageProto,
FirDeserializationContext.createForPackage(packageFqName, packageProto, nameResolver, session)
FirDeserializationContext.createForPackage(
packageFqName, packageProto, nameResolver, session,
JvmBinaryAnnotationDeserializer(session, nameResolver)
)
)
}
}
@@ -272,7 +275,6 @@ class KotlinDeserializedJvmSymbolsProvider(
return loadAnnotation(annotationClassId, result)
}
private fun findAndDeserializeClass(
classId: ClassId,
parentContext: FirDeserializationContext? = null
@@ -299,7 +301,11 @@ class KotlinDeserializedJvmSymbolsProvider(
val symbol = FirClassSymbol(classId)
deserializeClassToSymbol(
classId, classProto, symbol, nameResolver, session, parentContext,
classId, classProto, symbol, nameResolver, session,
parentContext ?: FirDeserializationContext.createForClass(
classId, classProto, nameResolver, session,
JvmBinaryAnnotationDeserializer(session, nameResolver)
),
this::findAndDeserializeClass
)
val annotations = mutableListOf<FirAnnotationCall>()