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

JVM_IR: patch parents of defaults in MemoizedInlineClassReplacements

Browse Source 
A minor fix for #2909
This commit is contained in:
pyos
2020-01-16 15:21:19 +01:00
committed by Georgy Bronnikov
parent da4807e6b8
commit 82ddd700ce
1 changed files with 3 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
+3 -2
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.ir.types.impl.IrStarProjectionImpl
import org.jetbrains.kotlin.ir.util.constructedClass import org.jetbrains.kotlin.ir.util.constructedClass
import org.jetbrains.kotlin.ir.util.defaultType import org.jetbrains.kotlin.ir.util.defaultType
import org.jetbrains.kotlin.ir.util.explicitParameters import org.jetbrains.kotlin.ir.util.explicitParameters
import org.jetbrains.kotlin.ir.util.patchDeclarationParents
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.InlineClassDescriptorResolver import org.jetbrains.kotlin.resolve.InlineClassDescriptorResolver
import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -159,7 +160,7 @@ class MemoizedInlineClassReplacements {
} }
// Assuming that constructors and non-override functions are always replaced with the unboxed // Assuming that constructors and non-override functions are always replaced with the unboxed
// equivalent, deep-copying the value here is unnecessary. See `JvmInlineClassLowering`. // equivalent, deep-copying the value here is unnecessary. See `JvmInlineClassLowering`.
newParameter.defaultValue = parameter.defaultValue newParameter.defaultValue = parameter.defaultValue?.patchDeclarationParents(this)
parameterMap[parameter.symbol] = newParameter parameterMap[parameter.symbol] = newParameter
} }
} }
@@ -185,7 +186,7 @@ class MemoizedInlineClassReplacements {
val newParameter = parameter.copyTo(this, index = index, name = name, defaultValue = null) val newParameter = parameter.copyTo(this, index = index, name = name, defaultValue = null)
valueParameters.add(newParameter) valueParameters.add(newParameter)
// See comment next to a similar line above. // See comment next to a similar line above.
newParameter.defaultValue = parameter.defaultValue newParameter.defaultValue = parameter.defaultValue?.patchDeclarationParents(this)
parameterMap[parameter.symbol] = newParameter parameterMap[parameter.symbol] = newParameter
} }
} }