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

Fix interpretation of arguments with default value

Browse Source
This commit is contained in:
Ivan Kylchik
2021-03-02 19:13:02 +03:00
committed by TeamCityServer
parent 38f4e6e8bf
commit a73173e480
2 changed files with 12 additions and 3 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
+11 -2
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.ir.types.impl.originalKotlinType
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
import java.lang.invoke.MethodHandle import java.lang.invoke.MethodHandle
private const val MAX_COMMANDS = 500_000 private const val MAX_COMMANDS = 500_000
@@ -206,6 +207,7 @@ class IrInterpreter(val irBuiltIns: IrBuiltIns, private val bodyMap: Map<IdSigna
else -> throw InterpreterError("Unsupported number of arguments for invocation as builtin functions") else -> throw InterpreterError("Unsupported number of arguments for invocation as builtin functions")
} }
} }
// TODO check "result is Unit"
stack.pushReturnValue(result.toState(result.getType(irFunction.returnType))) stack.pushReturnValue(result.toState(result.getType(irFunction.returnType)))
return Next return Next
} }
@@ -235,8 +237,15 @@ class IrInterpreter(val irBuiltIns: IrBuiltIns, private val bodyMap: Map<IdSigna
} }
val valueParametersSymbols = receiverAsFirstArgument + irFunction.valueParameters.map { it.symbol } val valueParametersSymbols = receiverAsFirstArgument + irFunction.valueParameters.map { it.symbol }
fun IrValueParameter.getDefault(): IrExpressionBody? {
return defaultValue
?: (this.parent as? IrSimpleFunction)?.overriddenSymbols
?.map { it.owner.valueParameters[this.index].getDefault() }
?.firstNotNullResult { it }
}
val valueArguments = (0 until expression.valueArgumentsCount).map { expression.getValueArgument(it) } val valueArguments = (0 until expression.valueArgumentsCount).map { expression.getValueArgument(it) }
val defaultValues = irFunction.valueParameters.map { it.defaultValue?.expression } val defaultValues = irFunction.valueParameters.map { expression.symbol.owner.valueParameters[it.index].getDefault()?.expression }
return stack.newFrame(asSubFrame = true, initPool = pool) { return stack.newFrame(asSubFrame = true, initPool = pool) {
for (i in valueArguments.indices) { for (i in valueArguments.indices) {
@@ -747,7 +756,7 @@ class IrInterpreter(val irBuiltIns: IrBuiltIns, private val bodyMap: Map<IdSigna
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<*> -> when { is Primitive<*> -> when {
expression.varargElementType.isArray() -> listOf(result) expression.varargElementType.isArray() || expression.varargElementType.isPrimitiveArray() -> listOf(result)
else -> arrayToList(result.value) else -> arrayToList(result.value)
} }
is Common -> when { is Common -> when {
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/stack/Stack.kt
+1 -1
View File
@@ -110,7 +110,7 @@ internal class StackImpl : Stack {
override fun clean(rootFile: IrFile?) { override fun clean(rootFile: IrFile?) {
stackCount = 0 stackCount = 0
frameList.clear() frameList.clear()
rootFile?.let { frameList.add(FrameContainer(rootFile)) } frameList.add(FrameContainer(rootFile))
} }
override fun addVar(variable: Variable) { override fun addVar(variable: Variable) {