jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Commonizer] Deserialize supertypes from provided dependencies

Browse Source 
^KT-47430 In Progress
This commit is contained in:
sebastian.sellmair
2021-08-11 09:50:13 +02:00
committed by Space
parent cdfe8d60a4
commit 50a343f91e
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirProvidedClassifiers.kt
View File

@@ -63,10 +63,12 @@ object CirProvided {
sealed interface Class : Classifier {
val visibility: Visibility
val supertypes: List<Type>
}
data class RegularClass(
override val typeParameters: List<TypeParameter>,
override val supertypes: List<Type>,
override val visibility: Visibility
) : Class
@@ -77,6 +79,8 @@ object CirProvided {
override val typeParameters: List<TypeParameter> get() = emptyList()
override val visibility: Visibility get() = Visibilities.Public
override val supertypes: List<Type>
get() = emptyList() // TODO!!
}
data class TypeAlias(

20
native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirProvidedClassifiersByModules.kt
View File

@@ -64,7 +64,7 @@ internal class CirProvidedClassifiersByModules private constructor(
return CirProvidedClassifiersByModules(hasForwardDeclarations, classifiers)
}
private val FALLBACK_FORWARD_DECLARATION_CLASS = CirProvided.RegularClass(emptyList(), Visibilities.Public)
private val FALLBACK_FORWARD_DECLARATION_CLASS = CirProvided.RegularClass(emptyList(), emptyList(), Visibilities.Public)
}
}
@@ -125,7 +125,9 @@ private fun readModule(metadata: SerializedMetadata, consumer: (CirEntityId, Cir
}
private class ClassProtosToRead {
data class ClassEntry(val classId: CirEntityId, val proto: ProtoBuf.Class)
data class ClassEntry(
val classId: CirEntityId, val proto: ProtoBuf.Class, val strings: NameResolver
)
// key = parent class ID (or NON_EXISTING_CLASSIFIER_ID for top-level classes)
// value = class protos under this parent class (MutableList to preserve order of classes)
@@ -138,7 +140,7 @@ private class ClassProtosToRead {
val classId = CirEntityId.create(strings.getQualifiedClassName(classProto.fqName))
val parentClassId: CirEntityId = classId.getParentEntityId() ?: NON_EXISTING_CLASSIFIER_ID
groupedByParentClassId.getValue(parentClassId) += ClassEntry(classId, classProto)
groupedByParentClassId.getValue(parentClassId) += ClassEntry(classId, classProto, strings)
}
}
@@ -155,12 +157,20 @@ private fun readClass(
) {
val (classId, classProto) = classEntry
val typeParameterNameToIndex = HashMap<Int, Int>()
val typeParameters = readTypeParameters(
typeParameterProtos = classProto.typeParameterList,
typeParameterIndexOffset = typeParameterIndexOffset
typeParameterIndexOffset = typeParameterIndexOffset,
nameToIndexMapper = typeParameterNameToIndex::set
)
val typeReadContext = TypeReadContext(classEntry.strings, TypeTable(classProto.typeTable), typeParameterNameToIndex)
val supertypes = classProto.supertypeList.map { readType(it, typeReadContext) } +
classProto.supertypeIdList.map { readType(classProto.typeTable.getType(it), typeReadContext) }
val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(classProto.flags))
val clazz = CirProvided.RegularClass(typeParameters, visibility)
val clazz = CirProvided.RegularClass(typeParameters, supertypes, visibility)
consumer(classId, clazz)