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

Forbid vararg flattening in place there array was expected

Browse Source
This commit is contained in:
Ivan Kylchik
2020-09-10 00:06:26 +03:00
committed by TeamCityServer
parent 8b2706aaee
commit ac858f760a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+4 -1
View File
@@ -750,7 +750,10 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns, private val bodyMap: Map
it.interpret().check { executionResult -> return executionResult } it.interpret().check { executionResult -> return executionResult }
return@flatMap when (val result = stack.popReturnValue()) { return@flatMap when (val result = stack.popReturnValue()) {
is Wrapper -> listOf(result.value) is Wrapper -> listOf(result.value)
is Primitive<*> -> arrayToList(result.value) is Primitive<*> -> when {
expression.varargElementType.isArray() -> listOf(result.value)
else -> arrayToList(result.value)
}
is Common -> when { is Common -> when {
result.irClass.defaultType.isUnsignedArray() -> arrayToList((result.fields.single().state as Primitive<*>).value) result.irClass.defaultType.isUnsignedArray() -> arrayToList((result.fields.single().state as Primitive<*>).value)
else -> listOf(result.asProxy(this, elementIrClass?.owner)) else -> listOf(result.asProxy(this, elementIrClass?.owner))