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

[KLIB] Don't use module descriptor to compute library in error reporter

Browse Source
This commit is contained in:
Roman Artemev
2021-11-15 17:14:37 +03:00
committed by TeamCityServer
parent de0b3e5b20
commit df9d039c03
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/linkerissues/UserVisibleIrModulesSupport.kt
+1 -4
View File
@@ -6,8 +6,6 @@
package org.jetbrains.kotlin.backend.common.serialization.linkerissues
import org.jetbrains.kotlin.backend.common.serialization.IrModuleDeserializer
import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
import org.jetbrains.kotlin.descriptors.konan.KlibModuleOrigin
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.library.uniqueName
@@ -200,9 +198,8 @@ open class UserVisibleIrModulesSupport(externalDependenciesLoader: ExternalDepen
}
}
// TODO: find a way to access KotlinLibrary without descriptors
protected val IrModuleDeserializer.kotlinLibrary: KotlinLibrary?
get() = (moduleDescriptor.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library
get() = klib as? KotlinLibrary
val moduleIdComparator: Comparator<ResolvedDependencyId> = Comparator { a, b ->
when {