From 0a2c457f54ecb5fc5d0b25cbe1783d8c213bbb5c Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 12 Dec 2019 19:16:30 +0300 Subject: [PATCH] [FIR] Properly check typealias fqn matching --- .../deserialization/KotlinDeserializedJvmSymbolsProvider.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt index 1682b8b4c8d..a4bec8a7b20 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt @@ -46,6 +46,7 @@ import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.isOneSegmentFQN import org.jetbrains.kotlin.resolve.constants.ClassLiteralValue import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData @@ -157,6 +158,7 @@ class KotlinDeserializedJvmSymbolsProvider( private fun findAndDeserializeTypeAlias( classId: ClassId ): FirTypeAliasSymbol? { + if (!classId.relativeClassName.isOneSegmentFQN()) return null return typeAliasCache.getOrPutNullable(classId) { getPackageParts(classId.packageFqName).firstNotNullResult { part -> val ids = part.typeAliasNameIndex[classId.shortClassName]