From be9d49dc7e19970255b227a8456eb43cb82bad0d Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Mon, 17 Feb 2020 21:58:53 +0700 Subject: [PATCH] [Metadata] Improve Forward-declaration related hack --- .../src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt | 3 ++- klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extracted/konan.serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt b/extracted/konan.serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt index 52f28c18c89..8168e0430c4 100644 --- a/extracted/konan.serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt +++ b/extracted/konan.serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt @@ -2,6 +2,7 @@ package org.jetbrains.kotlin.konan.utils import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns import org.jetbrains.kotlin.konan.util.KlibMetadataFactories +import org.jetbrains.kotlin.library.metadata.NativeTypeTransformer import org.jetbrains.kotlin.library.metadata.NullFlexibleTypeDeserializer import org.jetbrains.kotlin.storage.StorageManager @@ -9,4 +10,4 @@ fun createKonanBuiltIns(storageManager: StorageManager) = KonanBuiltIns(storageM /** * The default Kotlin/Native factories. */ -object KonanFactories : KlibMetadataFactories(::createKonanBuiltIns, NullFlexibleTypeDeserializer) \ No newline at end of file +object KonanFactories : KlibMetadataFactories(::createKonanBuiltIns, NullFlexibleTypeDeserializer, NativeTypeTransformer()) \ No newline at end of file diff --git a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt index f48dbbbe0ad..5d57684c1cd 100644 --- a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt +++ b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.library.unpackZippedKonanLibraryTo import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.konan.utils.createKonanBuiltIns import org.jetbrains.kotlin.backend.common.serialization.metadata.DynamicTypeDeserializer +import org.jetbrains.kotlin.descriptors.deserialization.PlatformDependentTypeTransformer import org.jetbrains.kotlin.util.Logger import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.konan.library.KonanLibrary @@ -29,7 +30,7 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.lang.System.out import kotlin.system.exitProcess -object KlibFactories : KlibMetadataFactories(::createKonanBuiltIns, DynamicTypeDeserializer) +object KlibFactories : KlibMetadataFactories(::createKonanBuiltIns, DynamicTypeDeserializer, PlatformDependentTypeTransformer.None) fun printUsage() { println("Usage: klib ")