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

[Metadata] Improve Forward-declaration related hack

Browse Source
This commit is contained in:
Roman Artemev
2020-02-17 21:58:53 +07:00
committed by Sergey Bogolepov
parent 2562522392
commit be9d49dc7e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extracted/konan.serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt
+2 -1
View File
@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.konan.utils
import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
import org.jetbrains.kotlin.konan.util.KlibMetadataFactories 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.library.metadata.NullFlexibleTypeDeserializer
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
@@ -9,4 +10,4 @@ fun createKonanBuiltIns(storageManager: StorageManager) = KonanBuiltIns(storageM
/** /**
* The default Kotlin/Native factories. * The default Kotlin/Native factories.
*/ */
object KonanFactories : KlibMetadataFactories(::createKonanBuiltIns, NullFlexibleTypeDeserializer) object KonanFactories : KlibMetadataFactories(::createKonanBuiltIns, NullFlexibleTypeDeserializer, NativeTypeTransformer())
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.library.unpackZippedKonanLibraryTo
import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.konan.util.KlibMetadataFactories
import org.jetbrains.kotlin.konan.utils.createKonanBuiltIns import org.jetbrains.kotlin.konan.utils.createKonanBuiltIns
import org.jetbrains.kotlin.backend.common.serialization.metadata.DynamicTypeDeserializer 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.util.Logger
import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
import org.jetbrains.kotlin.konan.library.KonanLibrary import org.jetbrains.kotlin.konan.library.KonanLibrary
@@ -29,7 +30,7 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager
import java.lang.System.out import java.lang.System.out
import kotlin.system.exitProcess import kotlin.system.exitProcess
object KlibFactories : KlibMetadataFactories(::createKonanBuiltIns, DynamicTypeDeserializer) object KlibFactories : KlibMetadataFactories(::createKonanBuiltIns, DynamicTypeDeserializer, PlatformDependentTypeTransformer.None)
fun printUsage() { fun printUsage() {
println("Usage: klib <command> <library> <options>") println("Usage: klib <command> <library> <options>")