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

JVM IR: Fix local delegated properties with inline class types

Browse Source
This commit is contained in:
Steven Schäfer
2019-10-02 11:13:54 +02:00
committed by Alexander Udalov
parent 24a8e1cd9c
commit e25a09f2f9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt
+4 -1
View File
@@ -47,7 +47,10 @@ class MemoizedInlineClassReplacements {
val getReplacementFunction: (IrFunction) -> IrReplacementFunction? = val getReplacementFunction: (IrFunction) -> IrReplacementFunction? =
storageManager.createMemoizedFunctionWithNullableValues { storageManager.createMemoizedFunctionWithNullableValues {
when { when {
!it.hasMangledParameters || it.isSyntheticInlineClassMember || it.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA -> null !it.hasMangledParameters ||
it.isSyntheticInlineClassMember ||
it.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA ||
it.origin == IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR -> null
it.hasMethodReplacement -> createMethodReplacement(it) it.hasMethodReplacement -> createMethodReplacement(it)
it.hasStaticReplacement -> createStaticReplacement(it) it.hasStaticReplacement -> createStaticReplacement(it)
else -> null else -> null
compiler/testData/codegen/box/inlineClasses/kt25750.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
import kotlin.reflect.KMutableProperty0 import kotlin.reflect.KMutableProperty0