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

Properly process root package symbol table index.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-04-25 23:18:21 +03:00
committed by alexander-gorshenev
parent 2d2ae56435
commit 0cc3fa56ab
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/StringTableUtil.kt
+2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.backend.konan.serialization package org.jetbrains.kotlin.backend.konan.serialization
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName import org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName
@@ -32,6 +33,7 @@ internal fun NameResolverImpl.getDescriptorByFqNameIndex(
fqNameIndex: Int): DeclarationDescriptor { fqNameIndex: Int): DeclarationDescriptor {
val packageName = this.getPackageFqName(fqNameIndex) val packageName = this.getPackageFqName(fqNameIndex)
if (packageName.isRoot) return module.getPackage(FqName.ROOT)
// TODO: Here we are using internals of NameresolverImpl. // TODO: Here we are using internals of NameresolverImpl.
// Consider extending NameResolver. // Consider extending NameResolver.
val proto = nameTable.getQualifiedName(fqNameIndex) val proto = nameTable.getQualifiedName(fqNameIndex)