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

[FIR] Store abbreviated type in deserialized declarations as attribute

Browse Source 
#KT-58542 Fixed
This commit is contained in:
Kirill Rakhman
2023-08-22 18:38:39 +02:00
committed by Space Team
parent 8e72f60996
commit 5b4409e34c
34 changed files with 251 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/typealias/deserializedAbbreviationWithRedundantArgument.fir.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
Module: a
FILE: a.kt
public final typealias Foo<T> = R|kotlin/collections/List<kotlin/String>|
public final class C<T> : R|kotlin/Any| {
public constructor<T>(): R|C<T>| {
super<R|kotlin/Any|>()
}
public final val foo: R|Foo<T>?| = Null(null)
public get(): R|Foo<T>?|
}
Module: b
FILE: b.kt
public final val bar: R|Foo<kotlin/Int>?| = R|/C.C|<R|kotlin/Int|>().R|SubstitutionOverride</C.foo: R|Foo<kotlin/Int>?|>|
public get(): R|Foo<kotlin/Int>?|
public final fun box(): R|kotlin/String| {
^box String(OK)
}
compiler/testData/codegen/box/typealias/deserializedAbbreviationWithRedundantArgument.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// FIR_DUMP
// MODULE: a
// FILE: a.kt
typealias Foo<T> = List<String>
class C<T> {
val foo: Foo<T>? = null
}
// MODULE: b(a)
// FILE: b.kt
val bar = C<Int>().foo
fun box() = "OK"
compiler/testData/loadJava/compiledKotlin/coroutines/TypeAliasFTSuspendWithReceiver.fir.txt → compiler/testData/loadJava/compiledKotlin/coroutines/TypeAliasFTSuspendWithReceiver.fir.k1.txt
Vendored
-1
View File
@@ -6,4 +6,3 @@ public final class Context : R|kotlin/Any| {
}
public final typealias SuspendWithContext = R|suspend test/Context.() -> kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/coroutines/TypeAliasFTSuspendWithReceiver.fir.k2.txt
Vendored
+9
View File
@@ -0,0 +1,9 @@
public final fun foo(f: R|@ExtensionFunctionType {@ExtensionFunctionType kotlin/coroutines/SuspendFunction1<test/Context, kotlin/Unit>=} suspend test/Context.() -> kotlin/Unit|): R|kotlin/Unit|
public final class Context : R|kotlin/Any| {
public constructor(): R|test/Context|
}
public final typealias SuspendWithContext = R|suspend test/Context.() -> kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/typealias/Basic.fir.k1.txt
Vendored
-23
View File
@@ -1,23 +0,0 @@
public final val x1: R|kotlin/String|
public get(): R|kotlin/String|
public final val x2: R|kotlin/String|
public get(): R|kotlin/String|
public final val x3: R|kotlin/String|
public get(): R|kotlin/String|
public final val x4: R|kotlin/String?|
public get(): R|kotlin/String?|
public final val x5: R|kotlin/String?|
public get(): R|kotlin/String?|
public final val x6: R|kotlin/String?|
public get(): R|kotlin/String?|
public final typealias S = R|kotlin/String|
public final typealias SS = R|test/S|
public final typealias SSS = R|test/SS|
compiler/testData/loadJava/compiledKotlin/typealias/Basic.fir.k2.txt
Vendored
-23
View File
@@ -1,23 +0,0 @@
public final val x1: R|kotlin/String|
public get(): R|kotlin/String|
public final val x2: R|kotlin/String|
public get(): R|kotlin/String|
public final val x3: R|kotlin/String|
public get(): R|kotlin/String|
public final val x4: R|kotlin/String?|
public get(): R|kotlin/String?|
public final val x5: R|kotlin/String?|
public get(): R|kotlin/String?|
public final val x6: R|kotlin/String?|
public get(): R|kotlin/String?|
public final typealias S = R|kotlin/String|
public final typealias SS = R|kotlin/String|
public final typealias SSS = R|kotlin/String|
compiler/testData/loadJava/compiledKotlin/typealias/Basic.fir.txt
Vendored
+23
View File
@@ -0,0 +1,23 @@
public final val x1: R|test/S|
public get(): R|test/S|
public final val x2: R|test/SS|
public get(): R|test/SS|
public final val x3: R|test/SSS|
public get(): R|test/SSS|
public final val x4: R|test/S?|
public get(): R|test/S?|
public final val x5: R|test/SS?|
public get(): R|test/SS?|
public final val x6: R|test/SSS?|
public get(): R|test/SSS?|
public final typealias S = R|kotlin/String|
public final typealias SS = R|test/S|
public final typealias SSS = R|test/SS|
compiler/testData/loadJava/compiledKotlin/typealias/Generic.fir.k1.txt
Vendored
-17
View File
@@ -1,17 +0,0 @@
public final fun test1(x: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
public final fun test2(x: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
public final fun test3(x: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
public final fun test4(x: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
public final fun test5(x: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
public final fun test6(x: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
public final typealias L<T> = R|kotlin/collections/List<T>|
public final typealias LL<T> = R|test/L<T>|
public final typealias LLL<T> = R|test/LL<T>|
compiler/testData/loadJava/compiledKotlin/typealias/Generic.fir.k2.txt
Vendored
-17
View File
@@ -1,17 +0,0 @@
public final fun test1(x: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
public final fun test2(x: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
public final fun test3(x: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
public final fun test4(x: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
public final fun test5(x: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
public final fun test6(x: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
public final typealias L<T> = R|kotlin/collections/List<T>|
public final typealias LL<T> = R|kotlin/collections/List<T>|
public final typealias LLL<T> = R|kotlin/collections/List<T>|
compiler/testData/loadJava/compiledKotlin/typealias/Generic.fir.txt
Vendored
+17
View File
@@ -0,0 +1,17 @@
public final fun test1(x: R|test/L<kotlin/String>|): R|kotlin/Unit|
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 test4(x: R|test/L<test/L<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 typealias L<T> = R|kotlin/collections/List<T>|
public final typealias LL<T> = R|test/L<T>|
public final typealias LLL<T> = R|test/LL<T>|