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

FIR2IR: honor user-contributed members in data class if any

Browse Source
This commit is contained in:
Jinseong Jeon
2020-06-17 16:22:31 -07:00
committed by Mikhail Glukhikh
parent b839a91050
commit 82ef6bf96c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+4 -2
View File
@@ -144,9 +144,11 @@ internal class ClassMemberGenerator(
val classId = firFunction?.symbol?.callableId?.classId val classId = firFunction?.symbol?.callableId?.classId
when { when {
DataClassMembersGenerator.isComponentN(irFunction) -> DataClassMembersGenerator.isComponentN(irFunction) ->
DataClassMembersGenerator(components).generateDataClassComponentBody(irFunction, classId!!) firFunction?.body?.let { irFunction.body = visitor.convertToIrBlockBody(it) }
?: DataClassMembersGenerator(components).generateDataClassComponentBody(irFunction, classId!!)
DataClassMembersGenerator.isCopy(irFunction) -> DataClassMembersGenerator.isCopy(irFunction) ->
DataClassMembersGenerator(components).generateDataClassCopyBody(irFunction, classId!!) firFunction?.body?.let { irFunction.body = visitor.convertToIrBlockBody(it) }
?: DataClassMembersGenerator(components).generateDataClassCopyBody(irFunction, classId!!)
else -> else ->
irFunction.body = firFunction?.body?.let { visitor.convertToIrBlockBody(it) } irFunction.body = firFunction?.body?.let { visitor.convertToIrBlockBody(it) }
} }
compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
// COMMON_COROUTINES_TEST // COMMON_COROUTINES_TEST
compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
// COMMON_COROUTINES_TEST // COMMON_COROUTINES_TEST