Fix the contracts serialization
This commit is contained in:
committed by
Pavel Punegov
parent
9798decca0
commit
87288ce4c7
+9
-3
@@ -325,9 +325,15 @@ class KonanDescriptorSerializer private constructor(
|
|||||||
builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion())
|
builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion())
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: K/N & Contracts???
|
val descriptorSerializer = DescriptorSerializer(
|
||||||
// contractSerializer.serializeContractOfFunctionIfAny(descriptor, builder, this)
|
containingDeclaration = containingDeclaration,
|
||||||
//
|
typeParameters = typeParameters,
|
||||||
|
extension = extension,
|
||||||
|
typeTable = typeTable,
|
||||||
|
versionRequirementTable = versionRequirementTable,
|
||||||
|
serializeTypeTableToFunction = serializeTypeTableToFunction)
|
||||||
|
contractSerializer.serializeContractOfFunctionIfAny(descriptor, builder, descriptorSerializer)
|
||||||
|
|
||||||
extension.serializeFunction(descriptor, builder)
|
extension.serializeFunction(descriptor, builder)
|
||||||
|
|
||||||
/* Konan specific chunk */
|
/* Konan specific chunk */
|
||||||
|
|||||||
+2
-1
@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.serialization.konan.impl
|
|||||||
|
|
||||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
||||||
import org.jetbrains.kotlin.config.LanguageVersionSettings
|
import org.jetbrains.kotlin.config.LanguageVersionSettings
|
||||||
|
import org.jetbrains.kotlin.contracts.ContractDeserializerImpl
|
||||||
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.NotFoundClasses
|
import org.jetbrains.kotlin.descriptors.NotFoundClasses
|
||||||
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
|
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
|
||||||
@@ -108,7 +109,7 @@ internal class KonanDeserializedModuleDescriptorFactoryImpl(
|
|||||||
NullFlexibleTypeDeserializer,
|
NullFlexibleTypeDeserializer,
|
||||||
emptyList(),
|
emptyList(),
|
||||||
notFoundClasses,
|
notFoundClasses,
|
||||||
ContractDeserializer.DEFAULT,
|
ContractDeserializerImpl(configuration),
|
||||||
extensionRegistryLite = KonanSerializerProtocol.extensionRegistry)
|
extensionRegistryLite = KonanSerializerProtocol.extensionRegistry)
|
||||||
|
|
||||||
for (packageFragment in deserializedPackageFragments) {
|
for (packageFragment in deserializedPackageFragments) {
|
||||||
|
|||||||
Reference in New Issue
Block a user