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

Fix in handling of nested vararg parameters

Browse Source
This commit is contained in:
Igor Chevdar
2017-03-20 17:38:00 +03:00
parent 9c180ff4e1
commit 3820ea0724
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/VarargLowering.kt
+2 -1
View File
@@ -79,6 +79,7 @@ class VarargInjectionLowering internal constructor(val context: Context): Declar
} }
override fun visitVararg(expression: IrVararg): IrExpression { override fun visitVararg(expression: IrVararg): IrExpression {
expression.transformChildrenVoid(transformer)
val hasSpreadElement = hasSpreadElement(expression) val hasSpreadElement = hasSpreadElement(expression)
if (!hasSpreadElement && expression.elements.all { it is IrConst<*> && KotlinBuiltIns.isString(it.type) }) { if (!hasSpreadElement && expression.elements.all { it is IrConst<*> && KotlinBuiltIns.isString(it.type) }) {
log("skipped vararg expression because it's string array literal") log("skipped vararg expression because it's string array literal")
@@ -98,7 +99,7 @@ class VarargInjectionLowering internal constructor(val context: Context): Declar
val vars = expression.elements.map { val vars = expression.elements.map {
val initVar = scope.createTemporaryVariable( val initVar = scope.createTemporaryVariable(
((it as? IrSpreadElement)?.expression ?: it as IrExpression).apply { it.transformChildrenVoid(transformer) }, (it as? IrSpreadElement)?.expression ?: it as IrExpression,
"elem".synthesizedString, true) "elem".synthesizedString, true)
block.statements.add(initVar) block.statements.add(initVar)
it to initVar it to initVar