From 646c7ad0af472f616265e091b7be4c06cd0c9317 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <zalim.bashorov@jetbrains.com>
Date: Tue, 17 Dec 2019 14:24:21 +0300
Subject: [PATCH] [IDE, klib] Support in IDE klibs with dynamic type

---
 .../ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt    | 4 ++--
 .../ide/konan/decompiler/KotlinNativeMetadataStubBuilder.kt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt
index 50caafe14c3..4c4e92225b7 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataDecompiler.kt
@@ -8,12 +8,12 @@ package org.jetbrains.kotlin.ide.konan.decompiler
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion
 import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol
-import org.jetbrains.kotlin.serialization.konan.NullFlexibleTypeDeserializer
+import org.jetbrains.kotlin.serialization.js.DynamicTypeDeserializer
 
 class KotlinNativeMetadataDecompiler : KotlinNativeMetadataDecompilerBase<KlibMetadataVersion>(
     KotlinNativeMetaFileType,
     { KlibMetadataSerializerProtocol },
-    NullFlexibleTypeDeserializer,
+    DynamicTypeDeserializer,
     { KlibMetadataVersion.INSTANCE },
     { KlibMetadataVersion.INVALID_VERSION },
     KotlinNativeMetaFileType.STUB_VERSION
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataStubBuilder.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataStubBuilder.kt
index 08a46209ff0..a27426f8246 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataStubBuilder.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetadataStubBuilder.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.decompiler.stubBuilder.createIncompatibleAbiVer
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.konan.NullFlexibleTypeDeserializer
+import org.jetbrains.kotlin.serialization.js.DynamicTypeDeserializer
 
 open class KotlinNativeMetadataStubBuilder(
     private val version: Int,
@@ -40,7 +40,7 @@ open class KotlinNativeMetadataStubBuilder(
                 val ktFileText = decompiledText(
                     file,
                     serializerProtocol(),
-                    NullFlexibleTypeDeserializer,
+                    DynamicTypeDeserializer,
                     renderer
                 )
                 createFileStub(content.project, ktFileText.text)