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

[FIR] Fix abbreviated type deserialization

Browse Source
This commit is contained in:
simon.ogorodnik
2020-03-19 21:01:47 +03:00
parent 2ce697b0b2
commit 4fac6d8fb5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Generic.txt
Vendored
+4 -3
View File
@@ -4,8 +4,9 @@ public final fun test2(x: R|test/LL<kotlin/String>|): R|kotlin/Unit|
public final fun test3(x: R|test/LLL<kotlin/String>|): R|kotlin/Unit| public final fun test3(x: R|test/LLL<kotlin/String>|): R|kotlin/Unit|
public final fun test4(x: R|test/L<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit| public final fun test4(x: R|test/L<test/L<kotlin/String>>|): R|kotlin/Unit|
public final fun test5(x: R|test/LL<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit| public final fun test5(x: R|test/LL<test/LL<kotlin/String>>|): R|kotlin/Unit|
public final fun test6(x: R|test/LLL<test/LLL<kotlin/String>>|): R|kotlin/Unit|
public final fun test6(x: R|test/LLL<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
+1 -1
View File
@@ -136,7 +136,7 @@ class FirTypeDeserializer(
val abbreviatedTypeProto = proto.abbreviatedType(typeTable) ?: return simpleType val abbreviatedTypeProto = proto.abbreviatedType(typeTable) ?: return simpleType
return ConeClassLikeTypeImpl(typeSymbol(abbreviatedTypeProto) as ConeClassLikeLookupTag, arguments, isNullable = false) return simpleType(abbreviatedTypeProto)
} }