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

Change signature in getArgsForMethodInvocation method

Browse Source
This commit is contained in:
Ivan Kylchik
2020-04-07 10:59:17 +03:00
parent 30e352ea27
commit fd51a9a085
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt
+2 -2
View File
@@ -152,7 +152,7 @@ class IrInterpreter(irModule: IrModuleFragment) {
private suspend fun MethodHandle?.invokeMethod(irFunction: IrFunction, data: Frame): ExecutionResult { private suspend fun MethodHandle?.invokeMethod(irFunction: IrFunction, data: Frame): ExecutionResult {
this ?: return handleIntrinsicMethods(irFunction, data) this ?: return handleIntrinsicMethods(irFunction, data)
val result = this.invokeWithArguments(irFunction.getArgsForMethodInvocation(data)) val result = this.invokeWithArguments(irFunction.getArgsForMethodInvocation(data.getAll()))
data.pushReturnValue(result.toState(result.getType(irFunction.returnType))) data.pushReturnValue(result.toState(result.getType(irFunction.returnType)))
return Next return Next
@@ -165,7 +165,7 @@ class IrInterpreter(irModule: IrModuleFragment) {
data.pushReturnValue(result.toState(result.getType(irFunction.returnType))) data.pushReturnValue(result.toState(result.getType(irFunction.returnType)))
} }
"arrayOf" -> { "arrayOf" -> {
val result = irFunction.getArgsForMethodInvocation(data).toTypedArray() val result = irFunction.getArgsForMethodInvocation(data.getAll()).toTypedArray()
data.pushReturnValue(result.toState(result.getType(irFunction.returnType))) data.pushReturnValue(result.toState(result.getType(irFunction.returnType)))
} }
"arrayOfNulls" -> { "arrayOfNulls" -> {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/Utils.kt
+4 -5
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.backend.common.interpreter package org.jetbrains.kotlin.backend.common.interpreter
import org.jetbrains.kotlin.backend.common.interpreter.builtins.evaluateIntrinsicAnnotation import org.jetbrains.kotlin.backend.common.interpreter.builtins.evaluateIntrinsicAnnotation
import org.jetbrains.kotlin.backend.common.interpreter.stack.* import org.jetbrains.kotlin.backend.common.interpreter.stack.Variable
import org.jetbrains.kotlin.backend.common.interpreter.state.* import org.jetbrains.kotlin.backend.common.interpreter.state.*
import org.jetbrains.kotlin.builtins.UnsignedTypes import org.jetbrains.kotlin.builtins.UnsignedTypes
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
@@ -178,8 +178,8 @@ fun IrType.getFqName(): String? {
return this.classOrNull?.owner?.fqNameForIrSerialization?.asString() return this.classOrNull?.owner?.fqNameForIrSerialization?.asString()
} }
fun IrFunction.getArgsForMethodInvocation(data: Frame): List<Any?> { fun IrFunction.getArgsForMethodInvocation(args: List<Variable>): List<Any?> {
val argsValues = data.getAll().map { val argsValues = args.map {
when (val state = it.state) { when (val state = it.state) {
is ExceptionState -> state.getThisAsCauseForException() is ExceptionState -> state.getThisAsCauseForException()
is Wrapper -> state.value is Wrapper -> state.value
@@ -191,9 +191,8 @@ fun IrFunction.getArgsForMethodInvocation(data: Frame): List<Any?> {
// TODO if vararg isn't last parameter // TODO if vararg isn't last parameter
// must convert vararg array into separated elements for correct invoke // must convert vararg array into separated elements for correct invoke
if (this.valueParameters.lastOrNull()?.varargElementType != null) { if (this.valueParameters.lastOrNull()?.varargElementType != null) {
val varargValue = argsValues.last()
argsValues.removeAt(argsValues.size - 1) argsValues.removeAt(argsValues.size - 1)
val varargState = data.getVariableState(this.valueParameters.last().descriptor)
val varargValue = (varargState as? Wrapper)?.value ?: (varargState as Primitive<*>).value
argsValues.addAll(varargValue as Array<out Any?>) argsValues.addAll(varargValue as Array<out Any?>)
} }