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

FIR JS: Refactor Klib serialization for FIR support

Browse Source
This commit is contained in:
Ilya Chernikov
2022-07-05 18:36:06 +02:00
parent c0cf8e508a
commit 0fbc099d32
6 changed files with 146 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt
+39 -32
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.serialization.ApproximatingStringTable
import org.jetbrains.kotlin.serialization.DescriptorSerializer
import org.jetbrains.kotlin.serialization.SerializableStringTable
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
@@ -66,30 +67,6 @@ abstract class KlibMetadataSerializer(
}
private fun SerializerContext.buildFragment(
packageProto: ProtoBuf.Package,
classesProto: List<Pair<ProtoBuf.Class, Int>>,
fqName: FqName,
isEmpty: Boolean
): ProtoBuf.PackageFragment {
val (stringTableProto, nameTableProto) = serializerExtension.stringTable.buildProto()
return ProtoBuf.PackageFragment.newBuilder()
.setPackage(packageProto)
.addAllClass_(classesProto.map { it.first })
.setStrings(stringTableProto)
.setQualifiedNames(nameTableProto)
.also { packageFragment ->
classesProto.forEach {
packageFragment.addExtension(KlibMetadataProtoBuf.className, it.second )
}
packageFragment.setExtension(KlibMetadataProtoBuf.isEmpty, isEmpty)
packageFragment.setExtension(KlibMetadataProtoBuf.fqName, fqName.asString())
}
.build()
}
private fun serializeClass(packageName: FqName,
classDescriptor: ClassDescriptor): List<Pair<ProtoBuf.Class, Int>> {
with(serializerContext) {
@@ -169,11 +146,12 @@ abstract class KlibMetadataSerializer(
else
buildPackageProto(fqName, nonCassDescriptors)
buildFragment(
buildKlibPackageFragment(
packageProto,
serializeClasses(fqName, classifierDescriptors),
fqName,
topLevelDescriptors.isEmpty() && classifierDescriptors.isEmpty()
topLevelDescriptors.isEmpty() && classifierDescriptors.isEmpty(),
serializerExtension.stringTable
)
}
)
@@ -195,33 +173,36 @@ abstract class KlibMetadataSerializer(
if (typeAliases.isNotEmpty()) buildPackageProto(fqName, typeAliases)
else emptyPackageProto()
buildFragment(
buildKlibPackageFragment(
packageProto,
classesProto,
fqName,
descriptors.isEmpty()
descriptors.isEmpty(),
serializerExtension.stringTable
)
}
}
result += topLevelDescriptors.maybeChunked(TOP_LEVEL_DECLARATION_COUNT_PER_FILE) { descriptors ->
withNewContext {
buildFragment(
buildKlibPackageFragment(
buildPackageProto(fqName, descriptors),
emptyList(),
fqName,
descriptors.isEmpty()
descriptors.isEmpty(),
serializerExtension.stringTable
)
}
}
if (result.isEmpty()) {
result += withNewContext {
buildFragment(
buildKlibPackageFragment(
emptyPackageProto(),
emptyList(),
fqName,
true
true,
serializerExtension.stringTable
)
}
}
@@ -297,3 +278,29 @@ fun DeclarationDescriptor.extractFileId(): Int? = when (this) {
internal val ModuleDescriptor.packageFragmentProviderForModuleContentWithoutDependencies: PackageFragmentProvider
get() = (this as? ModuleDescriptorImpl)?.packageFragmentProviderForModuleContentWithoutDependencies
?: error("Can't get a module content package fragments, it's not a ${ModuleDescriptorImpl::class.simpleName}.")
fun buildKlibPackageFragment(
packageProto: ProtoBuf.Package,
classesProto: List<Pair<ProtoBuf.Class, Int>>,
fqName: FqName,
isEmpty: Boolean,
stringTable: SerializableStringTable,
): ProtoBuf.PackageFragment {
val (stringTableProto, nameTableProto) = stringTable.buildProto()
return ProtoBuf.PackageFragment.newBuilder()
.setPackage(packageProto)
.addAllClass_(classesProto.map { it.first })
.setStrings(stringTableProto)
.setQualifiedNames(nameTableProto)
.also { packageFragment ->
classesProto.forEach {
packageFragment.addExtension(KlibMetadataProtoBuf.className, it.second )
}
packageFragment.setExtension(KlibMetadataProtoBuf.isEmpty, isEmpty)
packageFragment.setExtension(KlibMetadataProtoBuf.fqName, fqName.asString())
}
.build()
}