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

[IR] Split implementation of DataClassMembersGenerator to IR based and descriptor based

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-06-22 11:25:53 +03:00
committed by Space Team
parent 27f4b53570
commit 6bb7fc05df
19 changed files with 214 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.ir.txt
Vendored
+1 -1
View File
@@ -493,7 +493,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (genericArray: kotlin.Array<T of <root>.Test2>): <root>.Test2<T of <root>.Test2> declared in <root>.Test2'
CONSTRUCTOR_CALL 'public constructor <init> (genericArray: kotlin.Array<T of <root>.Test2>) declared in <root>.Test2' type=<root>.Test2<T of <root>.Test2> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.Test2
genericArray: GET_VAR 'genericArray: kotlin.Array<T of <root>.Test2> declared in <root>.Test2.copy' type=kotlin.Array<T of <root>.Test2> origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
overridden:
compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.kt.txt
Vendored
+1 -1
View File
@@ -154,7 +154,7 @@ data class Test2<T : Any?> {
}
fun copy(genericArray: Array<T> = <this>.#genericArray): Test2<T> {
return Test2<Any>(genericArray = genericArray)
return Test2<T>(genericArray = genericArray)
}
override operator fun equals(other: Any?): Boolean {
compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.ir.txt
Vendored
+3 -3
View File
@@ -33,7 +33,7 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (x: T of <root>.Test1): <root>.Test1<T of <root>.Test1> declared in <root>.Test1'
CONSTRUCTOR_CALL 'public constructor <init> (x: T of <root>.Test1) declared in <root>.Test1' type=<root>.Test1<T of <root>.Test1> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.Test1
x: GET_VAR 'x: T of <root>.Test1 declared in <root>.Test1.copy' type=T of <root>.Test1 origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1<T of <root>.Test1>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
overridden:
@@ -133,7 +133,7 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (x: T of <root>.Test2): <root>.Test2<T of <root>.Test2> declared in <root>.Test2'
CONSTRUCTOR_CALL 'public constructor <init> (x: T of <root>.Test2) declared in <root>.Test2' type=<root>.Test2<T of <root>.Test2> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.Test2
x: GET_VAR 'x: T of <root>.Test2 declared in <root>.Test2.copy' type=T of <root>.Test2 origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
overridden:
@@ -224,7 +224,7 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.collections.List<T of <root>.Test3>): <root>.Test3<T of <root>.Test3> declared in <root>.Test3'
CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.collections.List<T of <root>.Test3>) declared in <root>.Test3' type=<root>.Test3<T of <root>.Test3> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.Test3
x: GET_VAR 'x: kotlin.collections.List<T of <root>.Test3> declared in <root>.Test3.copy' type=kotlin.collections.List<T of <root>.Test3> origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test3<T of <root>.Test3>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
overridden:
compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.kt.txt
Vendored
+3 -3
View File
@@ -14,7 +14,7 @@ data class Test1<T : Any?> {
}
fun copy(x: T = <this>.#x): Test1<T> {
return Test1<Any>(x = x)
return Test1<T>(x = x)
}
override operator fun equals(other: Any?): Boolean {
@@ -60,7 +60,7 @@ data class Test2<T : Number> {
}
fun copy(x: T = <this>.#x): Test2<T> {
return Test2<Any>(x = x)
return Test2<T>(x = x)
}
override operator fun equals(other: Any?): Boolean {
@@ -103,7 +103,7 @@ data class Test3<T : Any?> {
}
fun copy(x: List<T> = <this>.#x): Test3<T> {
return Test3<Any>(x = x)
return Test3<T>(x = x)
}
override operator fun equals(other: Any?): Boolean {
compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt
Vendored
+2 -2
View File
@@ -56,8 +56,8 @@ FILE fqName:<root> fileName:/compareTo.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (first: A of <root>.Pair, second: B of <root>.Pair): <root>.Pair<A of <root>.Pair, B of <root>.Pair> declared in <root>.Pair'
CONSTRUCTOR_CALL 'public constructor <init> (first: A of <root>.Pair, second: B of <root>.Pair) declared in <root>.Pair' type=<root>.Pair<A of <root>.Pair, B of <root>.Pair> origin=null
<class: A>: kotlin.Any
<class: B>: kotlin.Any
<class: A>: A of <root>.Pair
<class: B>: B of <root>.Pair
first: GET_VAR 'first: A of <root>.Pair declared in <root>.Pair.copy' type=A of <root>.Pair origin=null
second: GET_VAR 'second: B of <root>.Pair declared in <root>.Pair.copy' type=B of <root>.Pair origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Pair<A of <root>.Pair, B of <root>.Pair>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ data class Pair<A : Any?, B : Any?> {
}
fun copy(first: A = <this>.#first, second: B = <this>.#second): Pair<A, B> {
return Pair<Any, Any>(first = first, second = second)
return Pair<A, B>(first = first, second = second)
}
override operator fun equals(other: Any?): Boolean {
compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.ir.txt
Vendored
+1 -1
View File
@@ -57,7 +57,7 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (x: T of <root>.Test, y: kotlin.String): <root>.Test<T of <root>.Test> declared in <root>.Test'
CONSTRUCTOR_CALL 'public constructor <init> (x: T of <root>.Test, y: kotlin.String) declared in <root>.Test' type=<root>.Test<T of <root>.Test> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.Test
x: GET_VAR 'x: T of <root>.Test declared in <root>.Test.copy' type=T of <root>.Test origin=null
y: GET_VAR 'y: kotlin.String declared in <root>.Test.copy' type=kotlin.String origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test<T of <root>.Test>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.kt.txt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ data class Test<T : Any?> {
}
fun copy(x: T = <this>.#x, y: String = <this>.#y): Test<T> {
return Test<Any>(x = x, y = y)
return Test<T>(x = x, y = y)
}
override operator fun equals(other: Any?): Boolean {
compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt
Vendored
+1 -1
View File
@@ -742,7 +742,7 @@ FILE fqName:<root> fileName:/ArrayMap.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (key: kotlin.Int, value: T of <root>.ArrayMapImpl.Entry): <root>.ArrayMapImpl.Entry<T of <root>.ArrayMapImpl.Entry> declared in <root>.ArrayMapImpl.Entry'
CONSTRUCTOR_CALL 'public constructor <init> (key: kotlin.Int, value: T of <root>.ArrayMapImpl.Entry) declared in <root>.ArrayMapImpl.Entry' type=<root>.ArrayMapImpl.Entry<T of <root>.ArrayMapImpl.Entry> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.ArrayMapImpl.Entry
key: GET_VAR 'key: kotlin.Int declared in <root>.ArrayMapImpl.Entry.copy' type=kotlin.Int origin=null
value: GET_VAR 'value: T of <root>.ArrayMapImpl.Entry declared in <root>.ArrayMapImpl.Entry.copy' type=T of <root>.ArrayMapImpl.Entry origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.ArrayMapImpl.Entry<T of <root>.ArrayMapImpl.Entry>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
compiler/testData/ir/irText/firProblems/ArrayMap.fir.kt.txt
Vendored
+1 -1
View File
@@ -292,7 +292,7 @@ internal class ArrayMapImpl<T : Any> : ArrayMap<T> {
}
fun copy(key: Int = <this>.#key, value: T = <this>.#value): Entry<T> {
return Entry<Any>(key = key, value = value)
return Entry<T>(key = key, value = value)
}
override operator fun equals(other: Any?): Boolean {
compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ FILE fqName:<root> fileName:/MultiList.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (value: T of <root>.Some): <root>.Some<T of <root>.Some> declared in <root>.Some'
CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Some) declared in <root>.Some' type=<root>.Some<T of <root>.Some> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.Some
value: GET_VAR 'value: T of <root>.Some declared in <root>.Some.copy' type=T of <root>.Some origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Some<T of <root>.Some>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
overridden:
compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ data class Some<T : Any?> {
}
fun copy(value: T = <this>.#value): Some<T> {
return Some<Any>(value = value)
return Some<T>(value = value)
}
override operator fun equals(other: Any?): Boolean {
compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt
Vendored
+1 -1
View File
@@ -75,7 +75,7 @@ FILE fqName:<root> fileName:/kt45236.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (error: kotlin.Throwable, value: T of <root>.NetRequestStatus.Error?): <root>.NetRequestStatus.Error<T of <root>.NetRequestStatus.Error> declared in <root>.NetRequestStatus.Error'
CONSTRUCTOR_CALL 'public constructor <init> (error: kotlin.Throwable, value: T of <root>.NetRequestStatus.Error?) declared in <root>.NetRequestStatus.Error' type=<root>.NetRequestStatus.Error<T of <root>.NetRequestStatus.Error> origin=null
<class: T>: kotlin.Any
<class: T>: T of <root>.NetRequestStatus.Error
error: GET_VAR 'error: kotlin.Throwable declared in <root>.NetRequestStatus.Error.copy' type=kotlin.Throwable origin=null
value: GET_VAR 'value: T of <root>.NetRequestStatus.Error? declared in <root>.NetRequestStatus.Error.copy' type=T of <root>.NetRequestStatus.Error? origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.NetRequestStatus.Error<T of <root>.NetRequestStatus.Error>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.ir.txt
Vendored
+1 -1
View File
@@ -35,7 +35,7 @@ FILE fqName:<root> fileName:/typeAliasWithUnsafeVariance.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun copy (action: kotlin.Function1<RenderingT of <root>.Tag, kotlin.Unit>): <root>.Tag<RenderingT of <root>.Tag> declared in <root>.Tag'
CONSTRUCTOR_CALL 'public constructor <init> (action: kotlin.Function1<RenderingT of <root>.Tag, kotlin.Unit>) declared in <root>.Tag' type=<root>.Tag<RenderingT of <root>.Tag> origin=null
<class: RenderingT>: kotlin.Any
<class: RenderingT>: RenderingT of <root>.Tag
action: GET_VAR 'action: kotlin.Function1<RenderingT of <root>.Tag, kotlin.Unit> declared in <root>.Tag.copy' type=kotlin.Function1<RenderingT of <root>.Tag, kotlin.Unit> origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Tag<RenderingT of <root>.Tag>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
overridden:
compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.kt.txt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ data class Tag<out RenderingT : Any?> {
}
fun copy(action: Function1<RenderingT, Unit> = <this>.#action): Tag<RenderingT> {
return Tag<Any>(action = action)
return Tag<RenderingT>(action = action)
}
override operator fun equals(other: Any?): Boolean {