From 0cc3fa56aba6dfeec50c7ccd1848ec6339f60129 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Tue, 25 Apr 2017 23:18:21 +0300 Subject: [PATCH] Properly process root package symbol table index. --- .../kotlin/backend/konan/serialization/StringTableUtil.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/StringTableUtil.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/StringTableUtil.kt index f84d9b370c5..3ada7abe787 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/StringTableUtil.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/StringTableUtil.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.backend.konan.serialization import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName @@ -32,6 +33,7 @@ internal fun NameResolverImpl.getDescriptorByFqNameIndex( fqNameIndex: Int): DeclarationDescriptor { val packageName = this.getPackageFqName(fqNameIndex) + if (packageName.isRoot) return module.getPackage(FqName.ROOT) // TODO: Here we are using internals of NameresolverImpl. // Consider extending NameResolver. val proto = nameTable.getQualifiedName(fqNameIndex)