From df6dcd646f5ab415b4f1db3ae2c1cac6962d7499 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 1 Oct 2019 16:54:18 +0700 Subject: [PATCH] Fix ClassCastException in KLIB reader --- .../jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt index 8ee8d8826aa..1203886a368 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt @@ -19,8 +19,7 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter import org.jetbrains.kotlin.library.KotlinLibrary -import org.jetbrains.kotlin.library.impl.BaseKotlinLibraryImpl -import org.jetbrains.kotlin.library.impl.MetadataLibraryImpl +import org.jetbrains.kotlin.library.impl.KotlinLibraryImpl import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.library.metadata.PackageAccessHandler import org.jetbrains.kotlin.metadata.ProtoBuf @@ -67,12 +66,12 @@ internal object CachingIdeKonanLibraryMetadataLoader : PackageAccessHandler { get() = KotlinNativeLoadingMetadataCache.getInstance() private val KotlinLibrary.moduleHeaderFile - get() = (this as MetadataLibraryImpl).access.layout.moduleHeaderFile + get() = (this as KotlinLibraryImpl).metadata.access.layout.moduleHeaderFile private fun KotlinLibrary.packageFragmentFile(packageFqName: String, partName: String) = - (this as MetadataLibraryImpl).access.layout.packageFragmentFile(packageFqName, partName) + (this as KotlinLibraryImpl).metadata.access.layout.packageFragmentFile(packageFqName, partName) private val KotlinLibrary.isZipped - get() = (this as BaseKotlinLibraryImpl).access.layout.isZipped + get() = (this as KotlinLibraryImpl).base.access.layout.isZipped }