From e0469de5be7acb56309e3f95aaba9c39bd5e05db Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 11 Sep 2014 13:09:13 +0400 Subject: [PATCH] Eval4j: fix coerce for arrays in return #KT-5554 Fixed --- eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt index 221f9ff8403..7ed86173e71 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt @@ -175,7 +175,7 @@ public fun interpreterLoop( IRETURN, LRETURN, FRETURN, DRETURN, ARETURN -> { val value = frame.getStackTop() val expectedType = Type.getReturnType(m.desc) - if (expectedType.getSort() == Type.OBJECT) { + if (expectedType.getSort() == Type.OBJECT || expectedType.getSort() == Type.ARRAY) { val coerced = if (value != NULL_VALUE && value.asmType != expectedType) ObjectValue(value.obj(), expectedType) else value