From 4fac6d8fb5a7a3b5a52cb92486edfc59aea29251 Mon Sep 17 00:00:00 2001 From: "simon.ogorodnik" Date: Thu, 19 Mar 2020 21:01:47 +0300 Subject: [PATCH] [FIR] Fix abbreviated type deserialization --- .../testData/loadCompiledKotlin/typealias/Generic.txt | 7 ++++--- .../kotlin/fir/deserialization/FirTypeDeserializer.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Generic.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Generic.txt index f5bed65583e..2f4995efd85 100644 --- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Generic.txt +++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Generic.txt @@ -4,8 +4,9 @@ public final fun test2(x: R|test/LL|): R|kotlin/Unit| public final fun test3(x: R|test/LLL|): R|kotlin/Unit| -public final fun test4(x: R|test/L>|): R|kotlin/Unit| +public final fun test4(x: R|test/L>|): R|kotlin/Unit| -public final fun test5(x: R|test/LL>|): R|kotlin/Unit| +public final fun test5(x: R|test/LL>|): R|kotlin/Unit| + +public final fun test6(x: R|test/LLL>|): R|kotlin/Unit| -public final fun test6(x: R|test/LLL>|): R|kotlin/Unit| diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt index 447088b2697..1e17106f776 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt @@ -136,7 +136,7 @@ class FirTypeDeserializer( val abbreviatedTypeProto = proto.abbreviatedType(typeTable) ?: return simpleType - return ConeClassLikeTypeImpl(typeSymbol(abbreviatedTypeProto) as ConeClassLikeLookupTag, arguments, isNullable = false) + return simpleType(abbreviatedTypeProto) }