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

JVM_IR: do not copy defaults in functions with inline class parameters

Browse Source
This commit is contained in:
pyos
2019-12-20 12:41:21 +01:00
committed by Georgy Bronnikov
parent 9e17140daf
commit 982a088f00
9 changed files with 73 additions and 3 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
+8 -3
View File
@@ -151,12 +151,15 @@ class MemoizedInlineClassReplacements {
val name = if (parameter == function.extensionReceiverParameter) Name.identifier("\$receiver") else parameter.name
val newParameter: IrValueParameter
if (parameter == function.dispatchReceiverParameter) {
newParameter = parameter.copyTo(this, index = -1, name = name)
newParameter = parameter.copyTo(this, index = -1, name = name, defaultValue = null)
dispatchReceiverParameter = newParameter
} else {
newParameter = parameter.copyTo(this, index = index - 1, name = name)
newParameter = parameter.copyTo(this, index = index - 1, name = name, defaultValue = null)
valueParameters.add(newParameter)
}
// Assuming that constructors and non-override functions are always replaced with the unboxed
// equivalent, deep-copying the value here is unnecessary. See `JvmInlineClassLowering`.
newParameter.defaultValue = parameter.defaultValue
parameterMap[parameter.symbol] = newParameter
}
}
@@ -176,8 +179,10 @@ class MemoizedInlineClassReplacements {
else -> parameter.name
}
val newParameter = parameter.copyTo(this, index = index, name = name)
val newParameter = parameter.copyTo(this, index = index, name = name, defaultValue = null)
valueParameters.add(newParameter)
// See comment next to a similar line above.
newParameter.defaultValue = parameter.defaultValue
parameterMap[parameter.symbol] = newParameter
}
}