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

When searching a descriptor by name,

Browse Source 
only search in exported symbols.
This commit is contained in:
Alexander Gorshenev
2017-04-27 15:04:04 +03:00
committed by alexander-gorshenev
parent 55c3b79786
commit ee6d70fb0f
1 changed files with 2 additions and 1 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/IrDescriptorDeserializer.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.backend.konan.Context
import org.jetbrains.kotlin.backend.konan.KonanIrDeserializationException import org.jetbrains.kotlin.backend.konan.KonanIrDeserializationException
import org.jetbrains.kotlin.backend.konan.descriptors.contributedMethods import org.jetbrains.kotlin.backend.konan.descriptors.contributedMethods
import org.jetbrains.kotlin.backend.konan.descriptors.isFunctionInvoke import org.jetbrains.kotlin.backend.konan.descriptors.isFunctionInvoke
import org.jetbrains.kotlin.backend.konan.llvm.isExported
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.ir.expressions.IrLoop import org.jetbrains.kotlin.ir.expressions.IrLoop
@@ -438,7 +439,7 @@ internal class IrDescriptorDeserializer(val context: Context,
fun findInTheDescriptorTree(proto: KonanIr.KotlinDescriptor): DeclarationDescriptor? { fun findInTheDescriptorTree(proto: KonanIr.KotlinDescriptor): DeclarationDescriptor? {
val matchingNames = matchNameInParentScope(proto) val matchingNames = matchNameInParentScope(proto).filter{it.isExported()}
if (matchingNames.size == 0) return null if (matchingNames.size == 0) return null
val originalDescriptor = selectAmongMatchingNames(matchingNames, proto) val originalDescriptor = selectAmongMatchingNames(matchingNames, proto)